We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -38,14 +38,14 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | // See Issue #1 (http://code.google.com/p/solr-php-client/issues/detail?id=1) |
| 40 | 40 | // Doesn't follow typical include path conventions, but is more convenient for users |
| 41 | -require_once(dirname(__FILE__) . '/Exception.php'); |
|
| 42 | -require_once(dirname(__FILE__) . '/HttpTransportException.php'); |
|
| 43 | -require_once(dirname(__FILE__) . '/InvalidArgumentException.php'); |
|
| 41 | +require_once(dirname(__FILE__).'/Exception.php'); |
|
| 42 | +require_once(dirname(__FILE__).'/HttpTransportException.php'); |
|
| 43 | +require_once(dirname(__FILE__).'/InvalidArgumentException.php'); |
|
| 44 | 44 | |
| 45 | -require_once(dirname(__FILE__) . '/Document.php'); |
|
| 46 | -require_once(dirname(__FILE__) . '/Response.php'); |
|
| 45 | +require_once(dirname(__FILE__).'/Document.php'); |
|
| 46 | +require_once(dirname(__FILE__).'/Response.php'); |
|
| 47 | 47 | |
| 48 | -require_once(dirname(__FILE__) . '/HttpTransport/Interface.php'); |
|
| 48 | +require_once(dirname(__FILE__).'/HttpTransport/Interface.php'); |
|
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * Starting point for the Solr API. Represents a Solr server resource and has |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | static public function phrase($value) |
| 222 | 222 | { |
| 223 | - return '"' . self::escapePhrase($value) . '"'; |
|
| 223 | + return '"'.self::escapePhrase($value).'"'; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
@@ -264,17 +264,17 @@ discard block |
||
| 264 | 264 | |
| 265 | 265 | foreach ($params as $key => $value) |
| 266 | 266 | { |
| 267 | - $escapedParams[] = urlencode($key) . '=' . urlencode($value); |
|
| 267 | + $escapedParams[] = urlencode($key).'='.urlencode($value); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - $queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams); |
|
| 270 | + $queryString = $this->_queryDelimiter.implode($this->_queryStringDelimiter, $escapedParams); |
|
| 271 | 271 | } |
| 272 | 272 | else |
| 273 | 273 | { |
| 274 | 274 | $queryString = ''; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - return 'http://' . $this->_host . ':' . $this->_port . $this->_path . $servlet . $queryString; |
|
| 277 | + return 'http://'.$this->_host.':'.$this->_port.$this->_path.$servlet.$queryString; |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
@@ -286,8 +286,8 @@ discard block |
||
| 286 | 286 | $this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET); |
| 287 | 287 | $this->_pingUrl = $this->_constructUrl(self::PING_SERVLET); |
| 288 | 288 | $this->_searchUrl = $this->_constructUrl(self::SEARCH_SERVLET); |
| 289 | - $this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER )); |
|
| 290 | - $this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER )); |
|
| 289 | + $this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER)); |
|
| 290 | + $this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER)); |
|
| 291 | 291 | |
| 292 | 292 | $this->_urlsInited = true; |
| 293 | 293 | } |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | { |
| 459 | 459 | $path = trim($path, '/'); |
| 460 | 460 | |
| 461 | - $this->_path = '/' . $path . '/'; |
|
| 461 | + $this->_path = '/'.$path.'/'; |
|
| 462 | 462 | |
| 463 | 463 | if ($this->_urlsInited) |
| 464 | 464 | { |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | // lazy load a default if one has not be set |
| 477 | 477 | if ($this->_httpTransport === false) |
| 478 | 478 | { |
| 479 | - require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php'); |
|
| 479 | + require_once(dirname(__FILE__).'/HttpTransport/FileGetContents.php'); |
|
| 480 | 480 | |
| 481 | 481 | $this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents(); |
| 482 | 482 | } |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | |
| 745 | 745 | if ($document->getBoost() !== false) |
| 746 | 746 | { |
| 747 | - $xml .= ' boost="' . $document->getBoost() . '"'; |
|
| 747 | + $xml .= ' boost="'.$document->getBoost().'"'; |
|
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | $xml .= '>'; |
@@ -758,11 +758,11 @@ discard block |
||
| 758 | 758 | { |
| 759 | 759 | foreach ($value as $multivalue) |
| 760 | 760 | { |
| 761 | - $xml .= '<field name="' . $key . '"'; |
|
| 761 | + $xml .= '<field name="'.$key.'"'; |
|
| 762 | 762 | |
| 763 | 763 | if ($fieldBoost !== false) |
| 764 | 764 | { |
| 765 | - $xml .= ' boost="' . $fieldBoost . '"'; |
|
| 765 | + $xml .= ' boost="'.$fieldBoost.'"'; |
|
| 766 | 766 | |
| 767 | 767 | // only set the boost for the first field in the set |
| 768 | 768 | $fieldBoost = false; |
@@ -770,21 +770,21 @@ discard block |
||
| 770 | 770 | |
| 771 | 771 | $multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8'); |
| 772 | 772 | |
| 773 | - $xml .= '>' . $multivalue . '</field>'; |
|
| 773 | + $xml .= '>'.$multivalue.'</field>'; |
|
| 774 | 774 | } |
| 775 | 775 | } |
| 776 | 776 | else |
| 777 | 777 | { |
| 778 | - $xml .= '<field name="' . $key . '"'; |
|
| 778 | + $xml .= '<field name="'.$key.'"'; |
|
| 779 | 779 | |
| 780 | 780 | if ($fieldBoost !== false) |
| 781 | 781 | { |
| 782 | - $xml .= ' boost="' . $fieldBoost . '"'; |
|
| 782 | + $xml .= ' boost="'.$fieldBoost.'"'; |
|
| 783 | 783 | } |
| 784 | 784 | |
| 785 | 785 | $value = htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8'); |
| 786 | 786 | |
| 787 | - $xml .= '>' . $value . '</field>'; |
|
| 787 | + $xml .= '>'.$value.'</field>'; |
|
| 788 | 788 | } |
| 789 | 789 | } |
| 790 | 790 | |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | $flushValue = $waitFlush ? 'true' : 'false'; |
| 825 | 825 | $searcherValue = $waitSearcher ? 'true' : 'false'; |
| 826 | 826 | |
| 827 | - $rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />'; |
|
| 827 | + $rawPost = '<commit expungeDeletes="'.$expungeValue.'" waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />'; |
|
| 828 | 828 | |
| 829 | 829 | return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout); |
| 830 | 830 | } |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | //escape special xml characters |
| 864 | 864 | $id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8'); |
| 865 | 865 | |
| 866 | - $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><id>' . $id . '</id></delete>'; |
|
| 866 | + $rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><id>'.$id.'</id></delete>'; |
|
| 867 | 867 | |
| 868 | 868 | return $this->delete($rawPost, $timeout); |
| 869 | 869 | } |
@@ -884,14 +884,14 @@ discard block |
||
| 884 | 884 | $pendingValue = $fromPending ? 'true' : 'false'; |
| 885 | 885 | $committedValue = $fromCommitted ? 'true' : 'false'; |
| 886 | 886 | |
| 887 | - $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">'; |
|
| 887 | + $rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'">'; |
|
| 888 | 888 | |
| 889 | 889 | foreach ($ids as $id) |
| 890 | 890 | { |
| 891 | 891 | //escape special xml characters |
| 892 | 892 | $id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8'); |
| 893 | 893 | |
| 894 | - $rawPost .= '<id>' . $id . '</id>'; |
|
| 894 | + $rawPost .= '<id>'.$id.'</id>'; |
|
| 895 | 895 | } |
| 896 | 896 | |
| 897 | 897 | $rawPost .= '</delete>'; |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | // escape special xml characters |
| 919 | 919 | $rawQuery = htmlspecialchars($rawQuery, ENT_NOQUOTES, 'UTF-8'); |
| 920 | 920 | |
| 921 | - $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><query>' . $rawQuery . '</query></delete>'; |
|
| 921 | + $rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><query>'.$rawQuery.'</query></delete>'; |
|
| 922 | 922 | |
| 923 | 923 | return $this->delete($rawPost, $timeout); |
| 924 | 924 | } |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | $queryString = $this->_generateQueryString($params); |
| 1045 | 1045 | |
| 1046 | 1046 | // the file contents will be sent to SOLR as the POST BODY - we use application/octect-stream as default mimetype |
| 1047 | - return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, false, $mimetype); |
|
| 1047 | + return $this->_sendRawPost($this->_extractUrl.$this->_queryDelimiter.$queryString, $data, false, $mimetype); |
|
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | 1050 | /** |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | $flushValue = $waitFlush ? 'true' : 'false'; |
| 1120 | 1120 | $searcherValue = $waitSearcher ? 'true' : 'false'; |
| 1121 | 1121 | |
| 1122 | - $rawPost = '<optimize waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />'; |
|
| 1122 | + $rawPost = '<optimize waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />'; |
|
| 1123 | 1123 | |
| 1124 | 1124 | return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout); |
| 1125 | 1125 | } |
@@ -1167,7 +1167,7 @@ discard block |
||
| 1167 | 1167 | |
| 1168 | 1168 | if ($method == self::METHOD_GET) |
| 1169 | 1169 | { |
| 1170 | - return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString); |
|
| 1170 | + return $this->_sendRawGet($this->_searchUrl.$this->_queryDelimiter.$queryString); |
|
| 1171 | 1171 | } |
| 1172 | 1172 | else if ($method == self::METHOD_POST) |
| 1173 | 1173 | { |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | // See Issue #1 (http://code.google.com/p/solr-php-client/issues/detail?id=1) |
| 40 | 40 | // Doesn't follow typical include path conventions, but is more convenient for users |
| 41 | -require_once(dirname(dirname(__FILE__)) . '/Service.php'); |
|
| 41 | +require_once(dirname(dirname(__FILE__)).'/Service.php'); |
|
| 42 | 42 | |
| 43 | -require_once(dirname(dirname(__FILE__)) . '/NoServiceAvailableException.php'); |
|
| 43 | +require_once(dirname(dirname(__FILE__)).'/NoServiceAvailableException.php'); |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Reference Implementation for using multiple Solr services in a distribution. Functionality |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | protected $_writePingTimeout = 4; |
| 73 | 73 | |
| 74 | 74 | // Configuration for server selection backoff intervals |
| 75 | - protected $_useBackoff = false; // Set to true to use more resillient write server selection |
|
| 76 | - protected $_backoffLimit = 600; // 10 minute default maximum |
|
| 77 | - protected $_backoffEscalation = 2.0; // Rate at which to increase backoff period |
|
| 78 | - protected $_defaultBackoff = 2.0; // Default backoff interval |
|
| 75 | + protected $_useBackoff = false; // Set to true to use more resillient write server selection |
|
| 76 | + protected $_backoffLimit = 600; // 10 minute default maximum |
|
| 77 | + protected $_backoffEscalation = 2.0; // Rate at which to increase backoff period |
|
| 78 | + protected $_defaultBackoff = 2.0; // Default backoff interval |
|
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc. |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | protected function _getServiceId($host, $port, $path) |
| 160 | 160 | { |
| 161 | - return $host . ':' . $port . $path; |
|
| 161 | + return $host.':'.$port.$path; |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | /** |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | { |
| 182 | 182 | if (isset($service['host']) && isset($service['port']) && isset($service['path'])) |
| 183 | 183 | { |
| 184 | - $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']); |
|
| 184 | + $id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']); |
|
| 185 | 185 | |
| 186 | 186 | $this->_readableServices[$id] = $service; |
| 187 | 187 | } |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | { |
| 212 | 212 | if (isset($service['host']) && isset($service['port']) && isset($service['path'])) |
| 213 | 213 | { |
| 214 | - $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']); |
|
| 214 | + $id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']); |
|
| 215 | 215 | } |
| 216 | 216 | else |
| 217 | 217 | { |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | { |
| 250 | 250 | if (isset($service['host']) && isset($service['port']) && isset($service['path'])) |
| 251 | 251 | { |
| 252 | - $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']); |
|
| 252 | + $id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']); |
|
| 253 | 253 | |
| 254 | 254 | $this->_writeableServices[$id] = $service; |
| 255 | 255 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | { |
| 280 | 280 | if (isset($service['host']) && isset($service['port']) && isset($service['path'])) |
| 281 | 281 | { |
| 282 | - $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']); |
|
| 282 | + $id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']); |
|
| 283 | 283 | } |
| 284 | 284 | else |
| 285 | 285 | { |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | */ |
| 356 | 356 | protected function _selectWriteService($forceSelect = false) |
| 357 | 357 | { |
| 358 | - if($this->_useBackoff) |
|
| 358 | + if ($this->_useBackoff) |
|
| 359 | 359 | { |
| 360 | 360 | return $this->_selectWriteServiceSafe($forceSelect); |
| 361 | 361 | } |
@@ -435,12 +435,12 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | $backoff *= $this->_backoffEscalation; |
| 437 | 437 | |
| 438 | - if($backoff > $this->_backoffLimit) |
|
| 438 | + if ($backoff > $this->_backoffLimit) |
|
| 439 | 439 | { |
| 440 | 440 | throw new Apache_Solr_NoServiceAvailableException('No write services were available. All timeouts exceeded.'); |
| 441 | 441 | } |
| 442 | 442 | |
| 443 | - } while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false); |
|
| 443 | + } while ($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false); |
|
| 444 | 444 | } |
| 445 | 445 | else |
| 446 | 446 | { |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | * @author Donovan Jimenez <[email protected]> |
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | -require_once(dirname(__FILE__) . '/ParserException.php'); |
|
| 39 | +require_once(dirname(__FILE__).'/ParserException.php'); |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * Represents a Solr response. Parses the raw response into a set of stdClass objects |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | 39 | // Require Apache_Solr_HttpTransport_Abstract |
| 40 | -require_once(dirname(__FILE__) . '/Abstract.php'); |
|
| 40 | +require_once(dirname(__FILE__).'/Abstract.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * An alternative Curl HTTP transport that opens and closes a curl session for |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | 39 | // require Apache_Solr_HttpTransport_Response |
| 40 | -require_once(dirname(__FILE__) . '/Response.php'); |
|
| 40 | +require_once(dirname(__FILE__).'/Response.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * Interface that all Transport (HTTP Requester) implementations must implement. These |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | 39 | // Require Apache_Solr_HttpTransport_Abstract |
| 40 | -require_once(dirname(__FILE__) . '/Abstract.php'); |
|
| 40 | +require_once(dirname(__FILE__).'/Abstract.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | 39 | // Require Apache_Solr_HttpTransport_Abstract |
| 40 | -require_once(dirname(__FILE__) . '/Abstract.php'); |
|
| 40 | +require_once(dirname(__FILE__).'/Abstract.php'); |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * A Curl based HTTP transport. Uses a single curl session for all requests. |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * @var array |
| 44 | 44 | * @access protected |
| 45 | 45 | */ |
| 46 | - protected $dmdSec = array (); |
|
| 46 | + protected $dmdSec = array(); |
|
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * Are the METS file's dmdSecs loaded? |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @var array |
| 70 | 70 | * @access protected |
| 71 | 71 | */ |
| 72 | - protected $fileGrps = array (); |
|
| 72 | + protected $fileGrps = array(); |
|
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | 75 | * Are the file groups loaded? |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | * @var array |
| 88 | 88 | * @access protected |
| 89 | 89 | */ |
| 90 | - protected $formats = array ( |
|
| 91 | - 'METS' => array ( |
|
| 90 | + protected $formats = array( |
|
| 91 | + 'METS' => array( |
|
| 92 | 92 | 'rootElement' => 'mets', |
| 93 | 93 | 'namespaceURI' => 'http://www.loc.gov/METS/', |
| 94 | 94 | ), |
| 95 | - 'XLINK' => array ( |
|
| 95 | + 'XLINK' => array( |
|
| 96 | 96 | 'rootElement' => 'xlink', |
| 97 | 97 | 'namespaceURI' => 'http://www.w3.org/1999/xlink', |
| 98 | 98 | ) |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @var array |
| 130 | 130 | * @access protected |
| 131 | 131 | */ |
| 132 | - protected $logicalUnits = array (); |
|
| 132 | + protected $logicalUnits = array(); |
|
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | 135 | * This holds the documents' parsed metadata array with their corresponding structMap//div's ID as array key |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | * @var array |
| 138 | 138 | * @access protected |
| 139 | 139 | */ |
| 140 | - protected $metadataArray = array (); |
|
| 140 | + protected $metadataArray = array(); |
|
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | 143 | * Is the metadata array loaded? |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * @var array |
| 179 | 179 | * @access protected |
| 180 | 180 | */ |
| 181 | - protected $physicalStructure = array (); |
|
| 181 | + protected $physicalStructure = array(); |
|
| 182 | 182 | |
| 183 | 183 | /** |
| 184 | 184 | * This holds the physical structure metadata |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * @var array |
| 187 | 187 | * @access protected |
| 188 | 188 | */ |
| 189 | - protected $physicalStructureInfo = array (); |
|
| 189 | + protected $physicalStructureInfo = array(); |
|
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | 192 | * Is the physical structure loaded? |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | * @var array (tx_dlf_document) |
| 228 | 228 | * @access protected |
| 229 | 229 | */ |
| 230 | - protected static $registry = array (); |
|
| 230 | + protected static $registry = array(); |
|
| 231 | 231 | |
| 232 | 232 | /** |
| 233 | 233 | * This holds the UID of the root document or zero if not multi-volumed |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | * @var array |
| 253 | 253 | * @access protected |
| 254 | 254 | */ |
| 255 | - protected $smLinks = array ('l2p' => array (), 'p2l' => array ()); |
|
| 255 | + protected $smLinks = array('l2p' => array(), 'p2l' => array()); |
|
| 256 | 256 | |
| 257 | 257 | /** |
| 258 | 258 | * Are the smLinks loaded? |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | * @var array |
| 270 | 270 | * @access protected |
| 271 | 271 | */ |
| 272 | - protected $tableOfContents = array (); |
|
| 272 | + protected $tableOfContents = array(); |
|
| 273 | 273 | |
| 274 | 274 | /** |
| 275 | 275 | * Is the table of contents loaded? |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | public static function clearRegistry() { |
| 332 | 332 | |
| 333 | 333 | // Reset registry array. |
| 334 | - self::$registry = array (); |
|
| 334 | + self::$registry = array(); |
|
| 335 | 335 | |
| 336 | 336 | } |
| 337 | 337 | |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | */ |
| 490 | 490 | public function getLogicalStructure($id, $recursive = FALSE) { |
| 491 | 491 | |
| 492 | - $details = array (); |
|
| 492 | + $details = array(); |
|
| 493 | 493 | |
| 494 | 494 | // Is the requested logical unit already loaded? |
| 495 | 495 | if (!$recursive && !empty($this->logicalUnits[$id])) { |
@@ -556,11 +556,11 @@ discard block |
||
| 556 | 556 | $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]); |
| 557 | 557 | |
| 558 | 558 | // Extract identity information. |
| 559 | - $details = array (); |
|
| 559 | + $details = array(); |
|
| 560 | 560 | |
| 561 | 561 | $details['id'] = $attributes['ID']; |
| 562 | 562 | |
| 563 | - $details['dmdId'] = (isset($attributes['DMDID']) ? $attributes['DMDID'] : ''); |
|
| 563 | + $details['dmdId'] = (isset($attributes['DMDID']) ? $attributes['DMDID'] : ''); |
|
| 564 | 564 | |
| 565 | 565 | $details['label'] = (isset($attributes['LABEL']) ? $attributes['LABEL'] : ''); |
| 566 | 566 | |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | // Get the files this structure element is pointing at. |
| 636 | - $details['files'] = array (); |
|
| 636 | + $details['files'] = array(); |
|
| 637 | 637 | |
| 638 | 638 | $fileUse = $this->_getFileGrps(); |
| 639 | 639 | |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | // Walk the structure recursively? And are there any children of the current element? |
| 656 | 656 | if ($recursive && count($structure->children('http://www.loc.gov/METS/')->div)) { |
| 657 | 657 | |
| 658 | - $details['children'] = array (); |
|
| 658 | + $details['children'] = array(); |
|
| 659 | 659 | |
| 660 | 660 | foreach ($structure->children('http://www.loc.gov/METS/')->div as $child) { |
| 661 | 661 | |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | |
| 704 | 704 | } |
| 705 | 705 | |
| 706 | - return array (); |
|
| 706 | + return array(); |
|
| 707 | 707 | |
| 708 | 708 | } |
| 709 | 709 | |
@@ -715,23 +715,23 @@ discard block |
||
| 715 | 715 | } |
| 716 | 716 | |
| 717 | 717 | // Initialize metadata array with empty values. |
| 718 | - $metadata = array ( |
|
| 719 | - 'title' => array (), |
|
| 720 | - 'title_sorting' => array (), |
|
| 721 | - 'author' => array (), |
|
| 722 | - 'place' => array (), |
|
| 723 | - 'year' => array (), |
|
| 724 | - 'prod_id' => array (), |
|
| 725 | - 'record_id' => array (), |
|
| 726 | - 'opac_id' => array (), |
|
| 727 | - 'union_id' => array (), |
|
| 728 | - 'urn' => array (), |
|
| 729 | - 'purl' => array (), |
|
| 730 | - 'type' => array (), |
|
| 731 | - 'volume' => array (), |
|
| 732 | - 'volume_sorting' => array (), |
|
| 733 | - 'collection' => array (), |
|
| 734 | - 'owner' => array (), |
|
| 718 | + $metadata = array( |
|
| 719 | + 'title' => array(), |
|
| 720 | + 'title_sorting' => array(), |
|
| 721 | + 'author' => array(), |
|
| 722 | + 'place' => array(), |
|
| 723 | + 'year' => array(), |
|
| 724 | + 'prod_id' => array(), |
|
| 725 | + 'record_id' => array(), |
|
| 726 | + 'opac_id' => array(), |
|
| 727 | + 'union_id' => array(), |
|
| 728 | + 'urn' => array(), |
|
| 729 | + 'purl' => array(), |
|
| 730 | + 'type' => array(), |
|
| 731 | + 'volume' => array(), |
|
| 732 | + 'volume_sorting' => array(), |
|
| 733 | + 'collection' => array(), |
|
| 734 | + 'owner' => array(), |
|
| 735 | 735 | ); |
| 736 | 736 | |
| 737 | 737 | // Get the logical structure node's DMDID. |
@@ -786,20 +786,20 @@ discard block |
||
| 786 | 786 | |
| 787 | 787 | } |
| 788 | 788 | |
| 789 | - return array (); |
|
| 789 | + return array(); |
|
| 790 | 790 | |
| 791 | 791 | } |
| 792 | 792 | |
| 793 | 793 | // Get the structure's type. |
| 794 | 794 | if (!empty($this->logicalUnits[$id])) { |
| 795 | 795 | |
| 796 | - $metadata['type'] = array ($this->logicalUnits[$id]['type']); |
|
| 796 | + $metadata['type'] = array($this->logicalUnits[$id]['type']); |
|
| 797 | 797 | |
| 798 | 798 | } else { |
| 799 | 799 | |
| 800 | 800 | $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE'); |
| 801 | 801 | |
| 802 | - $metadata['type'] = array ((string) $struct[0]); |
|
| 802 | + $metadata['type'] = array((string) $struct[0]); |
|
| 803 | 803 | |
| 804 | 804 | } |
| 805 | 805 | |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | |
| 829 | 829 | if ($values instanceof DOMNodeList && $values->length > 0) { |
| 830 | 830 | |
| 831 | - $metadata[$resArray['index_name']] = array (); |
|
| 831 | + $metadata[$resArray['index_name']] = array(); |
|
| 832 | 832 | |
| 833 | 833 | foreach ($values as $value) { |
| 834 | 834 | |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | } elseif (!($values instanceof DOMNodeList)) { |
| 840 | 840 | |
| 841 | - $metadata[$resArray['index_name']] = array (trim((string) $values)); |
|
| 841 | + $metadata[$resArray['index_name']] = array(trim((string) $values)); |
|
| 842 | 842 | |
| 843 | 843 | } |
| 844 | 844 | |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | // Set default value if applicable. |
| 848 | 848 | if (empty($metadata[$resArray['index_name']][0]) && $resArray['default_value']) { |
| 849 | 849 | |
| 850 | - $metadata[$resArray['index_name']] = array ($resArray['default_value']); |
|
| 850 | + $metadata[$resArray['index_name']] = array($resArray['default_value']); |
|
| 851 | 851 | |
| 852 | 852 | } |
| 853 | 853 | |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | } else { |
| 891 | 891 | |
| 892 | 892 | // There is no dmdSec for this structure node. |
| 893 | - return array (); |
|
| 893 | + return array(); |
|
| 894 | 894 | |
| 895 | 895 | } |
| 896 | 896 | |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) { |
| 1121 | 1121 | |
| 1122 | 1122 | // Update format registry. |
| 1123 | - $this->formats[$resArray['type']] = array ( |
|
| 1123 | + $this->formats[$resArray['type']] = array( |
|
| 1124 | 1124 | 'rootElement' => $resArray['root'], |
| 1125 | 1125 | 'namespaceURI' => $resArray['namespace'], |
| 1126 | 1126 | 'class' => $resArray['class'] |
@@ -1303,7 +1303,7 @@ discard block |
||
| 1303 | 1303 | |
| 1304 | 1304 | if (TYPO3_DLOG) { |
| 1305 | 1305 | |
| 1306 | - \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'), |
|
| 1306 | + \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type '.$GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'), |
|
| 1307 | 1307 | self::$extKey, SYSLOG_SEVERITY_ERROR); |
| 1308 | 1308 | |
| 1309 | 1309 | } |
@@ -1315,7 +1315,7 @@ discard block |
||
| 1315 | 1315 | $metadata['type'][0] = $structure; |
| 1316 | 1316 | |
| 1317 | 1317 | // Get UIDs for collections. |
| 1318 | - $collections = array (); |
|
| 1318 | + $collections = array(); |
|
| 1319 | 1319 | |
| 1320 | 1320 | $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
| 1321 | 1321 | 'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.uid AS uid', |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | // Insert new collection. |
| 1347 | 1347 | $collNewUid = uniqid('NEW'); |
| 1348 | 1348 | |
| 1349 | - $collData['tx_dlf_collections'][$collNewUid] = array ( |
|
| 1349 | + $collData['tx_dlf_collections'][$collNewUid] = array( |
|
| 1350 | 1350 | 'pid' => $pid, |
| 1351 | 1351 | 'label' => $collection, |
| 1352 | 1352 | 'index_name' => $collection, |
@@ -1422,7 +1422,7 @@ discard block |
||
| 1422 | 1422 | // Insert new library. |
| 1423 | 1423 | $libNewUid = uniqid('NEW'); |
| 1424 | 1424 | |
| 1425 | - $libData['tx_dlf_libraries'][$libNewUid] = array ( |
|
| 1425 | + $libData['tx_dlf_libraries'][$libNewUid] = array( |
|
| 1426 | 1426 | 'pid' => $pid, |
| 1427 | 1427 | 'label' => $metadata['owner'][0], |
| 1428 | 1428 | 'index_name' => $metadata['owner'][0], |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | |
| 1473 | 1473 | if ($parentLocation != $this->location) { |
| 1474 | 1474 | |
| 1475 | - $parentDoc =& tx_dlf_document::getInstance($parentLocation, $pid); |
|
| 1475 | + $parentDoc = & tx_dlf_document::getInstance($parentLocation, $pid); |
|
| 1476 | 1476 | |
| 1477 | 1477 | if ($parentDoc->ready) { |
| 1478 | 1478 | |
@@ -1526,9 +1526,9 @@ discard block |
||
| 1526 | 1526 | } |
| 1527 | 1527 | |
| 1528 | 1528 | // Get metadata for lists and sorting. |
| 1529 | - $listed = array (); |
|
| 1529 | + $listed = array(); |
|
| 1530 | 1530 | |
| 1531 | - $sortable = array (); |
|
| 1531 | + $sortable = array(); |
|
| 1532 | 1532 | |
| 1533 | 1533 | $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
| 1534 | 1534 | 'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable', |
@@ -1560,7 +1560,7 @@ discard block |
||
| 1560 | 1560 | } |
| 1561 | 1561 | |
| 1562 | 1562 | // Fill data array. |
| 1563 | - $data['tx_dlf_documents'][$this->uid] = array ( |
|
| 1563 | + $data['tx_dlf_documents'][$this->uid] = array( |
|
| 1564 | 1564 | 'pid' => $pid, |
| 1565 | 1565 | $GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['starttime'] => 0, |
| 1566 | 1566 | $GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['endtime'] => 0, |
@@ -1843,7 +1843,7 @@ discard block |
||
| 1843 | 1843 | |
| 1844 | 1844 | } |
| 1845 | 1845 | |
| 1846 | - return array (); |
|
| 1846 | + return array(); |
|
| 1847 | 1847 | |
| 1848 | 1848 | } |
| 1849 | 1849 | |
@@ -2386,7 +2386,7 @@ discard block |
||
| 2386 | 2386 | $hookObjects = tx_dlf_helper::getHookObjects('common/class.tx_dlf_document.php'); |
| 2387 | 2387 | |
| 2388 | 2388 | // Apply hooks. |
| 2389 | - foreach($hookObjects as $hookObj) { |
|
| 2389 | + foreach ($hookObjects as $hookObj) { |
|
| 2390 | 2390 | |
| 2391 | 2391 | if (method_exists($hookObj, 'construct_postProcessRecordId')) { |
| 2392 | 2392 | |
@@ -2565,7 +2565,7 @@ discard block |
||
| 2565 | 2565 | // SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization |
| 2566 | 2566 | $this->asXML = $this->xml->asXML(); |
| 2567 | 2567 | |
| 2568 | - return array ('uid', 'pid', 'recordId', 'parentId', 'asXML'); |
|
| 2568 | + return array('uid', 'pid', 'recordId', 'parentId', 'asXML'); |
|
| 2569 | 2569 | |
| 2570 | 2570 | } |
| 2571 | 2571 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @var array |
| 47 | 47 | * @access protected |
| 48 | 48 | */ |
| 49 | - protected $buttonArray = array (); |
|
| 49 | + protected $buttonArray = array(); |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Holds the module's marker array |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @var array |
| 55 | 55 | * @access protected |
| 56 | 56 | */ |
| 57 | - protected $markerArray = array (); |
|
| 57 | + protected $markerArray = array(); |
|
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * Holds the module's subpart array |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * @var array |
| 63 | 63 | * @access protected |
| 64 | 64 | */ |
| 65 | - protected $subpartArray = array (); |
|
| 65 | + protected $subpartArray = array(); |
|
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * Holds the TYPO3_CONF_VARS array of this extension |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @var array |
| 71 | 71 | * @access protected |
| 72 | 72 | */ |
| 73 | - protected $conf = array (); |
|
| 73 | + protected $conf = array(); |
|
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * Holds the submitted form's data |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $this->doc->setModuleTemplate('EXT:'.$this->extKey.'/modules/'.$this->modPath.'template.tmpl'); |
| 107 | 107 | |
| 108 | - $this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey) . 'res/backend.css'); |
|
| 108 | + $this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey).'res/backend.css'); |
|
| 109 | 109 | |
| 110 | 110 | $this->doc->backPath = $GLOBALS['BACK_PATH']; |
| 111 | 111 | |