kitodo / kitodo-publication

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/ConnectionPool/StaticConnectionPoolTest.php

Indentation +59 added lines, -59 removed lines

@@ -25,13 +25,13 @@ 
     public function testAddOneHostThenGetConnection()
     {
         $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                          ->shouldReceive('ping')
-                          ->andReturn(true)
-                          ->getMock()
-                          ->shouldReceive('isAlive')
-                          ->andReturn(true)
-                          ->getMock()
-                          ->shouldReceive('markDead')->once()->getMock();
+                            ->shouldReceive('ping')
+                            ->andReturn(true)
+                            ->getMock()
+                            ->shouldReceive('isAlive')
+                            ->andReturn(true)
+                            ->getMock()
+                            ->shouldReceive('markDead')->once()->getMock();
 
         $connections = array($mockConnection);
 
@@ -59,13 +59,13 @@ 
 
         foreach (range(1,10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                              ->shouldReceive('ping')
-                              ->andReturn(true)
-                              ->getMock()
-                              ->shouldReceive('isAlive')
-                              ->andReturn(true)
-                              ->getMock()
-                              ->shouldReceive('markDead')->once()->getMock();
+                                ->shouldReceive('ping')
+                                ->andReturn(true)
+                                ->getMock()
+                                ->shouldReceive('isAlive')
+                                ->andReturn(true)
+                                ->getMock()
+                                ->shouldReceive('markDead')->once()->getMock();
 
             $connections[] = $mockConnection;
         }
@@ -96,15 +96,15 @@ 
 
         foreach (range(1,10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                              ->shouldReceive('ping')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('isAlive')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('markDead')->once()->getMock()
-                              ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                              ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
+                                ->shouldReceive('ping')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('isAlive')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('markDead')->once()->getMock()
+                                ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
+                                ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
 
             $connections[] = $mockConnection;
         }
@@ -131,29 +131,29 @@ 
 
         foreach (range(1,9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                              ->shouldReceive('ping')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('isAlive')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('markDead')->once()->getMock()
-                              ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                              ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
+                                ->shouldReceive('ping')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('isAlive')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('markDead')->once()->getMock()
+                                ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
+                                ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
 
             $connections[] = $mockConnection;
         }
 
         $goodConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                          ->shouldReceive('ping')->once()
-                          ->andReturn(true)
-                          ->getMock()
-                          ->shouldReceive('isAlive')->once()
-                          ->andReturn(false)
-                          ->getMock()
-                          ->shouldReceive('markDead')->once()->getMock()
-                          ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                          ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
+                            ->shouldReceive('ping')->once()
+                            ->andReturn(true)
+                            ->getMock()
+                            ->shouldReceive('isAlive')->once()
+                            ->andReturn(false)
+                            ->getMock()
+                            ->shouldReceive('markDead')->once()->getMock()
+                            ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
+                            ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
 
         $connections[] = $goodConnection;
 
@@ -179,29 +179,29 @@ 
 
         foreach (range(1,9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                              ->shouldReceive('ping')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('isAlive')
-                              ->andReturn(false)
-                              ->getMock()
-                              ->shouldReceive('markDead')->once()->getMock()
-                              ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                              ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
+                                ->shouldReceive('ping')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('isAlive')
+                                ->andReturn(false)
+                                ->getMock()
+                                ->shouldReceive('markDead')->once()->getMock()
+                                ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
+                                ->shouldReceive('getLastPing')->andReturn(time())->once()->getMock();
 
             $connections[] = $mockConnection;
         }
 
         $goodConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                          ->shouldReceive('ping')->once()
-                          ->andReturn(true)
-                          ->getMock()
-                          ->shouldReceive('isAlive')->once()
-                          ->andReturn(false)
-                          ->getMock()
-                          ->shouldReceive('markDead')->once()->getMock()
-                          ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                          ->shouldReceive('getLastPing')->andReturn(time()-10000)->once()->getMock();
+                            ->shouldReceive('ping')->once()
+                            ->andReturn(true)
+                            ->getMock()
+                            ->shouldReceive('isAlive')->once()
+                            ->andReturn(false)
+                            ->getMock()
+                            ->shouldReceive('markDead')->once()->getMock()
+                            ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
+                            ->shouldReceive('getLastPing')->andReturn(time()-10000)->once()->getMock();
 
         $connections[] = $goodConnection;
 

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
                           ->getMock()
                           ->shouldReceive('markDead')->once()->getMock();
 
-        $connections = array($mockConnection);
+        $connections = array ($mockConnection);
 
         $selector = m::mock('\Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector')
                     ->shouldReceive('select')
@@ -55,9 +55,9 @@ 
     public function testAddMultipleHostsThenGetFirst()
     {
 
-        $connections = array();
+        $connections = array ();
 
-        foreach (range(1,10) as $index) {
+        foreach (range(1, 10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
                               ->andReturn(true)
@@ -92,9 +92,9 @@ 
     public function testAllHostsFailPing()
     {
 
-        $connections = array();
+        $connections = array ();
 
-        foreach (range(1,10) as $index) {
+        foreach (range(1, 10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
                               ->andReturn(false)
@@ -127,9 +127,9 @@ 
     public function testAllExceptLastHostFailPingRevivesInSkip()
     {
 
-        $connections = array();
+        $connections = array ();
 
-        foreach (range(1,9) as $index) {
+        foreach (range(1, 9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
                               ->andReturn(false)
@@ -175,9 +175,9 @@ 
     public function testAllExceptLastHostFailPingRevivesPreSkip()
     {
 
-        $connections = array();
+        $connections = array ();
 
-        foreach (range(1,9) as $index) {
+        foreach (range(1, 9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
                               ->andReturn(false)
@@ -201,7 +201,7 @@ 
                           ->getMock()
                           ->shouldReceive('markDead')->once()->getMock()
                           ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
-                          ->shouldReceive('getLastPing')->andReturn(time()-10000)->once()->getMock();
+                          ->shouldReceive('getLastPing')->andReturn(time() - 10000)->once()->getMock();
 
         $connections[] = $goodConnection;
 

Braces +6 added lines, -12 removed lines

@@ -15,15 +15,13 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class StaticConnectionPoolTest extends \PHPUnit_Framework_TestCase
-{
+class StaticConnectionPoolTest extends \PHPUnit_Framework_TestCase {
 
     public function tearDown() {
         m::close();
     }
 
-    public function testAddOneHostThenGetConnection()
-    {
+    public function testAddOneHostThenGetConnection() {
         $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                           ->shouldReceive('ping')
                           ->andReturn(true)
@@ -52,8 +50,7 @@ 
     }
 
 
-    public function testAddMultipleHostsThenGetFirst()
-    {
+    public function testAddMultipleHostsThenGetFirst() {
 
         $connections = array();
 
@@ -89,8 +86,7 @@ 
     /**
      * @expectedException Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
-    public function testAllHostsFailPing()
-    {
+    public function testAllHostsFailPing() {
 
         $connections = array();
 
@@ -124,8 +120,7 @@ 
     }
 
 
-    public function testAllExceptLastHostFailPingRevivesInSkip()
-    {
+    public function testAllExceptLastHostFailPingRevivesInSkip() {
 
         $connections = array();
 
@@ -172,8 +167,7 @@ 
 
     }
 
-    public function testAllExceptLastHostFailPingRevivesPreSkip()
-    {
+    public function testAllExceptLastHostFailPingRevivesPreSkip() {
 
         $connections = array();
 

Upper-Lower-Casing +19 added lines, -19 removed lines

@@ -26,10 +26,10 @@ 
     {
         $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                           ->shouldReceive('ping')
-                          ->andReturn(true)
+                          ->andReturn(TRUE)
                           ->getMock()
                           ->shouldReceive('isAlive')
-                          ->andReturn(true)
+                          ->andReturn(TRUE)
                           ->getMock()
                           ->shouldReceive('markDead')->once()->getMock();
 
@@ -42,7 +42,7 @@ 
 
         $connectionFactory = m::mock('\Elasticsearch\Connections\ConnectionFactory');
 
-        $randomizeHosts = false;
+        $randomizeHosts = FALSE;
         $connectionPool = new \Elasticsearch\ConnectionPool\StaticConnectionPool($connections, $selector, $connectionFactory, $randomizeHosts);
 
         $retConnection = $connectionPool->nextConnection();
@@ -60,10 +60,10 @@ 
         foreach (range(1,10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
-                              ->andReturn(true)
+                              ->andReturn(TRUE)
                               ->getMock()
                               ->shouldReceive('isAlive')
-                              ->andReturn(true)
+                              ->andReturn(TRUE)
                               ->getMock()
                               ->shouldReceive('markDead')->once()->getMock();
 
@@ -77,7 +77,7 @@ 
 
         $connectionFactory = m::mock('\Elasticsearch\Connections\ConnectionFactory');
 
-        $randomizeHosts = false;
+        $randomizeHosts = FALSE;
         $connectionPool = new \Elasticsearch\ConnectionPool\StaticConnectionPool($connections, $selector, $connectionFactory, $randomizeHosts);
 
         $retConnection = $connectionPool->nextConnection();
@@ -97,10 +97,10 @@ 
         foreach (range(1,10) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('isAlive')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('markDead')->once()->getMock()
                               ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
@@ -116,7 +116,7 @@ 
 
         $connectionFactory = m::mock('\Elasticsearch\Connections\ConnectionFactory');
 
-        $randomizeHosts = false;
+        $randomizeHosts = FALSE;
         $connectionPool = new \Elasticsearch\ConnectionPool\StaticConnectionPool($connections, $selector, $connectionFactory, $randomizeHosts);
 
         $connectionPool->nextConnection();
@@ -132,10 +132,10 @@ 
         foreach (range(1,9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('isAlive')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('markDead')->once()->getMock()
                               ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
@@ -146,10 +146,10 @@ 
 
         $goodConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                           ->shouldReceive('ping')->once()
-                          ->andReturn(true)
+                          ->andReturn(TRUE)
                           ->getMock()
                           ->shouldReceive('isAlive')->once()
-                          ->andReturn(false)
+                          ->andReturn(FALSE)
                           ->getMock()
                           ->shouldReceive('markDead')->once()->getMock()
                           ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
@@ -164,7 +164,7 @@ 
 
         $connectionFactory = m::mock('\Elasticsearch\Connections\ConnectionFactory');
 
-        $randomizeHosts = false;
+        $randomizeHosts = FALSE;
         $connectionPool = new \Elasticsearch\ConnectionPool\StaticConnectionPool($connections, $selector, $connectionFactory, $randomizeHosts);
 
         $ret = $connectionPool->nextConnection();
@@ -180,10 +180,10 @@ 
         foreach (range(1,9) as $index) {
             $mockConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                               ->shouldReceive('ping')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('isAlive')
-                              ->andReturn(false)
+                              ->andReturn(FALSE)
                               ->getMock()
                               ->shouldReceive('markDead')->once()->getMock()
                               ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
@@ -194,10 +194,10 @@ 
 
         $goodConnection = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                           ->shouldReceive('ping')->once()
-                          ->andReturn(true)
+                          ->andReturn(TRUE)
                           ->getMock()
                           ->shouldReceive('isAlive')->once()
-                          ->andReturn(false)
+                          ->andReturn(FALSE)
                           ->getMock()
                           ->shouldReceive('markDead')->once()->getMock()
                           ->shouldReceive('getPingFailures')->andReturn(0)->once()->getMock()
@@ -212,7 +212,7 @@ 
 
         $connectionFactory = m::mock('\Elasticsearch\Connections\ConnectionFactory');
 
-        $randomizeHosts = false;
+        $randomizeHosts = FALSE;
         $connectionPool = new \Elasticsearch\ConnectionPool\StaticConnectionPool($connections, $selector, $connectionFactory, $randomizeHosts);
 
         $ret = $connectionPool->nextConnection();

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php

Indentation +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
         $mockConnections = array();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->times(16)->andReturn(true)->getMock();
+                                ->shouldReceive('isAlive')->times(16)->andReturn(true)->getMock();
 
         foreach (range(0,9) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');
@@ -54,10 +54,10 @@ 
 
         $mockConnections = array();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->once()->andReturn(false)->getMock();
+                                ->shouldReceive('isAlive')->once()->andReturn(false)->getMock();
 
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->times(15)->andReturn(true)->getMock();
+                                ->shouldReceive('isAlive')->times(15)->andReturn(true)->getMock();
 
         foreach (range(0,8) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');

Spacing +6 added lines, -6 removed lines

@@ -31,16 +31,16 @@ 
     {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
 
-        $mockConnections = array();
+        $mockConnections = array ();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                              ->shouldReceive('isAlive')->times(16)->andReturn(true)->getMock();
 
-        foreach (range(0,9) as $index) {
+        foreach (range(0, 9) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');
         }
 
 
-        foreach (range(0,15) as $index) {
+        foreach (range(0, 15) as $index) {
             $retConnection = $roundRobin->select($mockConnections);
 
             $this->assertEquals($mockConnections[0], $retConnection);
@@ -52,19 +52,19 @@ 
     {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
 
-        $mockConnections = array();
+        $mockConnections = array ();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                              ->shouldReceive('isAlive')->once()->andReturn(false)->getMock();
 
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
                              ->shouldReceive('isAlive')->times(15)->andReturn(true)->getMock();
 
-        foreach (range(0,8) as $index) {
+        foreach (range(0, 8) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');
         }
 
 
-        foreach (range(0,15) as $index) {
+        foreach (range(0, 15) as $index) {
             $retConnection = $roundRobin->select($mockConnections);
 
             $this->assertEquals($mockConnections[1], $retConnection);

Braces +3 added lines, -6 removed lines

@@ -19,16 +19,14 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class StickyRoundRobinSelectorTest extends \PHPUnit_Framework_TestCase
-{
+class StickyRoundRobinSelectorTest extends \PHPUnit_Framework_TestCase {
 
     public function tearDown() {
         m::close();
     }
 
 
-    public function testTenConnections()
-    {
+    public function testTenConnections() {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
 
         $mockConnections = array();
@@ -48,8 +46,7 @@ 
 
     }
 
-    public function testTenConnectionsFirstDies()
-    {
+    public function testTenConnectionsFirstDies() {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\StickyRoundRobinSelector();
 
         $mockConnections = array();

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
         $mockConnections = array();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->times(16)->andReturn(true)->getMock();
+                             ->shouldReceive('isAlive')->times(16)->andReturn(TRUE)->getMock();
 
         foreach (range(0,9) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');
@@ -54,10 +54,10 @@ 
 
         $mockConnections = array();
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->once()->andReturn(false)->getMock();
+                             ->shouldReceive('isAlive')->once()->andReturn(FALSE)->getMock();
 
         $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection')
-                             ->shouldReceive('isAlive')->times(15)->andReturn(true)->getMock();
+                             ->shouldReceive('isAlive')->times(15)->andReturn(TRUE)->getMock();
 
         foreach (range(0,8) as $index) {
             $mockConnections[] = m::mock('\Elasticsearch\Connections\GuzzleConnection');

Lib/Vendor/Httpful/Response.php

Indentation +12 added lines, -12 removed lines

@@ -11,17 +11,17 @@ 
 {
 
     public $body,
-           $raw_body,
-           $headers,
-           $raw_headers,
-           $request,
-           $code = 0,
-           $content_type,
-           $parent_type,
-           $charset,
-           $meta_data,
-           $is_mime_vendor_specific = false,
-           $is_mime_personal = false;
+            $raw_body,
+            $headers,
+            $raw_headers,
+            $request,
+            $code = 0,
+            $content_type,
+            $parent_type,
+            $charset,
+            $meta_data,
+            $is_mime_vendor_specific = false,
+            $is_mime_personal = false;
 
     private $parsers;
     /**
@@ -103,7 +103,7 @@ 
                 : $this->parent_type;
         }
 
-       return Httpful::get($parse_with)->parse($body);
+        return Httpful::get($parse_with)->parse($body);
     }
 
     /**

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      * @param Request $request
      * @param array $meta_data
      */
-    public function __construct($body, $headers, Request $request, array $meta_data = array())
+    public function __construct($body, $headers, Request $request, array $meta_data = array ())
     {
         $this->request      = $request;
         $this->raw_headers  = $headers;
@@ -42,7 +42,7 @@ 
 
         $this->_interpretHeaders();
 
-        $this->body         = $this->_parse($body);
+        $this->body = $this->_parse($body);
     }
 
     /**
@@ -115,7 +115,7 @@ 
     public function _parseHeaders($headers)
     {
         $headers = preg_split("/(\r|\n)+/", $headers, -1, \PREG_SPLIT_NO_EMPTY);
-        $parse_headers = array();
+        $parse_headers = array ();
         for ($i = 1; $i < count($headers); $i++) {
             list($key, $raw_value) = explode(':', $headers[$i], 2);
             $key = trim($key);

Braces +12 added lines, -19 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @author Nate Good <me@nategood.com>
  */
-class Response
-{
+class Response {
 
     public $body,
            $raw_body,
@@ -30,8 +29,7 @@ 
      * @param Request $request
      * @param array $meta_data
      */
-    public function __construct($body, $headers, Request $request, array $meta_data = array())
-    {
+    public function __construct($body, $headers, Request $request, array $meta_data = array()) {
         $this->request      = $request;
         $this->raw_headers  = $headers;
         $this->raw_body     = $body;
@@ -58,16 +56,14 @@ 
      *
      * @return bool Did we receive a 4xx or 5xx?
      */
-    public function hasErrors()
-    {
+    public function hasErrors() {
         return $this->code >= 400;
     }
 
     /**
      * @return return bool
      */
-    public function hasBody()
-    {
+    public function hasBody() {
         return !empty($this->body);
     }
 
@@ -78,8 +74,7 @@ 
      * @return array|string|object the response parse accordingly
      * @param string Http response body
      */
-    public function _parse($body)
-    {
+    public function _parse($body) {
         // If the user decided to forgo the automatic
         // smart parsing, short circuit.
         if (!$this->request->auto_parse) {
@@ -112,8 +107,7 @@ 
      * @return array parse headers
      * @param string $headers raw headers
      */
-    public function _parseHeaders($headers)
-    {
+    public function _parseHeaders($headers) {
         $headers = preg_split("/(\r|\n)+/", $headers, -1, \PREG_SPLIT_NO_EMPTY);
         $parse_headers = array();
         for ($i = 1; $i < count($headers); $i++) {
@@ -134,10 +128,11 @@ 
         return $parse_headers;
     }
 
-    public function _parseCode($headers)
-    {
+    public function _parseCode($headers) {
         $end = strpos($headers, "\r\n");
-        if ($end === false) $end = strlen($headers);
+        if ($end === false) {
+            $end = strlen($headers);
+        }
         $parts = explode(' ', substr($headers, 0, $end));
         if (count($parts) < 2 || !is_numeric($parts[1])) {
             throw new \Exception("Unable to parse response code from HTTP response due to malformed response");
@@ -149,8 +144,7 @@ 
      * After we've parse the headers, let's clean things
      * up a bit and treat some headers specially
      */
-    public function _interpretHeaders()
-    {
+    public function _interpretHeaders() {
         // Parse the Content-Type and charset
         $content_type = isset($this->headers['Content-Type']) ? $this->headers['Content-Type'] : '';
         $content_type = explode(';', $content_type);
@@ -187,8 +181,7 @@ 
     /**
      * @return string
      */
-    public function __toString()
-    {
+    public function __toString() {
         return $this->raw_body;
     }
 }

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -20,8 +20,8 @@ 
            $parent_type,
            $charset,
            $meta_data,
-           $is_mime_vendor_specific = false,
-           $is_mime_personal = false;
+           $is_mime_vendor_specific = FALSE,
+           $is_mime_personal = FALSE;
 
     private $parsers;
     /**
@@ -137,7 +137,7 @@ 
     public function _parseCode($headers)
     {
         $end = strpos($headers, "\r\n");
-        if ($end === false) $end = strlen($headers);
+        if ($end === FALSE) $end = strlen($headers);
         $parts = explode(' ', substr($headers, 0, $end));
         if (count($parts) < 2 || !is_numeric($parts[1])) {
             throw new \Exception("Unable to parse response code from HTTP response due to malformed response");
@@ -156,7 +156,7 @@ 
         $content_type = explode(';', $content_type);
 
         $this->content_type = $content_type[0];
-        if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) {
+        if (count($content_type) == 2 && strpos($content_type[1], '=') !== FALSE) {
             list($nill, $this->charset) = explode('=', $content_type[1]);
         }
 
@@ -170,7 +170,7 @@ 
         }
 
         // Is vendor type? Is personal type?
-        if (strpos($this->content_type, '/') !== false) {
+        if (strpos($this->content_type, '/') !== FALSE) {
             list($type, $sub_type) = explode('/', $this->content_type);
             $this->is_mime_vendor_specific = substr($sub_type, 0, 4) === 'vnd.';
             $this->is_mime_personal = substr($sub_type, 0, 4) === 'prs.';
@@ -178,7 +178,7 @@ 
 
         // Parent type (e.g. xml for application/vnd.github.message+xml)
         $this->parent_type = $this->content_type;
-        if (strpos($this->content_type, '+') !== false) {
+        if (strpos($this->content_type, '+') !== FALSE) {
             list($vendor, $this->parent_type) = explode('+', $this->content_type, 2);
             $this->parent_type = Mime::getFullMime($this->parent_type);
         }

Lib/Vendor/Httpful/Request.php

Indentation +23 added lines, -23 removed lines

@@ -29,24 +29,24 @@ 
     const MAX_REDIRECTS_DEFAULT     = 25;
 
     public $uri,
-           $method                  = Http::GET,
-           $headers                 = array(),
-           $raw_headers             = '',
-           $strict_ssl              = false,
-           $content_type,
-           $expected_type,
-           $additional_curl_opts    = array(),
-           $auto_parse              = true,
-           $serialize_payload_method = self::SERIALIZE_PAYLOAD_SMART,
-           $username,
-           $password,
-           $serialized_payload,
-           $payload,
-           $parse_callback,
-           $error_callback,
-           $follow_redirects        = false,
-           $max_redirects           = self::MAX_REDIRECTS_DEFAULT,
-           $payload_serializers     = array();
+            $method                  = Http::GET,
+            $headers                 = array(),
+            $raw_headers             = '',
+            $strict_ssl              = false,
+            $content_type,
+            $expected_type,
+            $additional_curl_opts    = array(),
+            $auto_parse              = true,
+            $serialize_payload_method = self::SERIALIZE_PAYLOAD_SMART,
+            $username,
+            $password,
+            $serialized_payload,
+            $payload,
+            $parse_callback,
+            $error_callback,
+            $follow_redirects        = false,
+            $max_redirects           = self::MAX_REDIRECTS_DEFAULT,
+            $payload_serializers     = array();
 
     // Options
     // private $_options = array(
@@ -56,7 +56,7 @@ 
 
     // Curl Handle
     public $_ch,
-           $_debug;
+            $_debug;
 
     // Template Request object
     private static $_template;
@@ -807,10 +807,10 @@ 
 
         $request = new Request();
         return $request
-               ->_setDefaults()
-               ->method($method)
-               ->sendsType($mime)
-               ->expectsType($mime);
+                ->_setDefaults()
+                ->method($method)
+                ->sendsType($mime)
+                ->expectsType($mime);
     }
 
     /**

Spacing +15 added lines, -15 removed lines

@@ -30,12 +30,12 @@ 
 
     public $uri,
            $method                  = Http::GET,
-           $headers                 = array(),
+           $headers                 = array (),
            $raw_headers             = '',
            $strict_ssl              = false,
            $content_type,
            $expected_type,
-           $additional_curl_opts    = array(),
+           $additional_curl_opts    = array (),
            $auto_parse              = true,
            $serialize_payload_method = self::SERIALIZE_PAYLOAD_SMART,
            $username,
@@ -46,7 +46,7 @@ 
            $error_callback,
            $follow_redirects        = false,
            $max_redirects           = self::MAX_REDIRECTS_DEFAULT,
-           $payload_serializers     = array();
+           $payload_serializers     = array ();
 
     // Options
     // private $_options = array(
@@ -412,7 +412,7 @@ 
     public function contentType($mime)
     {
         if (empty($mime)) return $this;
-        $this->content_type  = Mime::getFullMime($mime);
+        $this->content_type = Mime::getFullMime($mime);
         if ($this->isUpload()) {
             $this->neverSerializePayload();
         }
@@ -461,7 +461,7 @@ 
     {
         $this->addOnCurlOption(CURLOPT_PROXY, "{$proxy_host}:{$proxy_port}");
         $this->addOnCurlOption(CURLOPT_PROXYTYPE, $proxy_type);
-        if (in_array($auth_type, array(CURLAUTH_BASIC,CURLAUTH_NTLM))) {
+        if (in_array($auth_type, array (CURLAUTH_BASIC, CURLAUTH_NTLM))) {
             $this->addOnCurlOption(CURLOPT_PROXYAUTH, $auth_type)
                 ->addOnCurlOption(CURLOPT_PROXYUSERPWD, "{$auth_username}:{$auth_password}");
         }
@@ -754,7 +754,7 @@ 
         // recusion.  Do not use this syntax elsewhere.
         // It goes against the whole readability
         // and transparency idea.
-        self::$_template = new Request(array('method' => Http::GET));
+        self::$_template = new Request(array ('method' => Http::GET));
 
         // This is more like it...
         self::$_template
@@ -844,11 +844,11 @@ 
             if (!file_exists($this->client_cert))
                 throw new \Exception('Could not read Client Certificate');
 
-            curl_setopt($ch, CURLOPT_SSLCERTTYPE,   $this->client_encoding);
-            curl_setopt($ch, CURLOPT_SSLKEYTYPE,    $this->client_encoding);
-            curl_setopt($ch, CURLOPT_SSLCERT,       $this->client_cert);
-            curl_setopt($ch, CURLOPT_SSLKEY,        $this->client_key);
-            curl_setopt($ch, CURLOPT_SSLKEYPASSWD,  $this->client_passphrase);
+            curl_setopt($ch, CURLOPT_SSLCERTTYPE, $this->client_encoding);
+            curl_setopt($ch, CURLOPT_SSLKEYTYPE, $this->client_encoding);
+            curl_setopt($ch, CURLOPT_SSLCERT, $this->client_cert);
+            curl_setopt($ch, CURLOPT_SSLKEY, $this->client_key);
+            curl_setopt($ch, CURLOPT_SSLKEYPASSWD, $this->client_passphrase);
             // curl_setopt($ch, CURLOPT_SSLCERTPASSWD,  $this->client_cert_passphrase);
         }
 
@@ -884,7 +884,7 @@ 
             }
         }
 
-        $headers = array();
+        $headers = array ();
         // https://github.com/nategood/httpful/issues/37
         // Except header removes any HTTP 1.1 Continue from response headers
         $headers[] = 'Expect:';
@@ -917,9 +917,9 @@ 
         }
 
         $url = \parse_url($this->uri);
-        $path = (isset($url['path']) ? $url['path'] : '/').(isset($url['query']) ? '?'.$url['query'] : '');
+        $path = (isset($url['path']) ? $url['path'] : '/') . (isset($url['query']) ? '?' . $url['query'] : '');
         $this->raw_headers = "{$this->method} $path HTTP/1.1\r\n";
-        $host = (isset($url['host']) ? $url['host'] : 'localhost').(isset($url['port']) ? ':'.$url['port'] : '');
+        $host = (isset($url['host']) ? $url['host'] : 'localhost') . (isset($url['port']) ? ':' . $url['port'] : '');
         $this->raw_headers .= "Host: $host\r\n";
         $this->raw_headers .= \implode("\r\n", $headers);
         $this->raw_headers .= "\r\n";
@@ -978,7 +978,7 @@ 
             $user_agent .= '?.?.?';
         }
 
-        $user_agent .= ' PHP/'. PHP_VERSION . ' (' . PHP_OS . ')';
+        $user_agent .= ' PHP/' . PHP_VERSION . ' (' . PHP_OS . ')';
 
         if (isset($_SERVER['SERVER_SOFTWARE'])) {
             $user_agent .= ' ' . \preg_replace('~PHP/[\d\.]+~U', '',

Braces +126 added lines, -178 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @author Nate Good <me@nategood.com>
  */
-class Request
-{
+class Request {
 
     // Option constants
     const SERIALIZE_PAYLOAD_NEVER   = 0;
@@ -68,9 +67,10 @@ 
      * for internal use.
      * @param array $attrs hash of initial attribute values
      */
-    private function __construct($attrs = null)
-    {
-        if (!is_array($attrs)) return;
+    private function __construct($attrs = null) {
+        if (!is_array($attrs)) {
+            return;
+        }
         foreach ($attrs as $attr => $value) {
             $this->$attr = $value;
         }
@@ -90,8 +90,7 @@ 
      * scheme of things as it typically only occurs once
      * @param Request $template
      */
-    public static function ini(Request $template)
-    {
+    public static function ini(Request $template) {
         self::$_template = clone $template;
     }
 
@@ -99,8 +98,7 @@ 
      * Reset the default template back to the
      * library defaults.
      */
-    public static function resetIni()
-    {
+    public static function resetIni() {
         self::_initializeDefaults();
     }
 
@@ -110,8 +108,7 @@ 
      * @param string|null $attr Name of attribute (e.g. mime, headers)
      *    if null just return the whole template object;
      */
-    public static function d($attr)
-    {
+    public static function d($attr) {
         return isset($attr) ? self::$_template->$attr : self::$_template;
     }
 
@@ -120,32 +117,28 @@ 
     /**
      * @return bool does the request have a timeout?
      */
-    public function hasTimeout()
-    {
+    public function hasTimeout() {
         return isset($this->timeout);
     }
 
     /**
      * @return bool has the internal curl request been initialized?
      */
-    public function hasBeenInitialized()
-    {
+    public function hasBeenInitialized() {
         return isset($this->_ch);
     }
 
     /**
      * @return bool Is this request setup for basic auth?
      */
-    public function hasBasicAuth()
-    {
+    public function hasBasicAuth() {
         return isset($this->password) && isset($this->username);
     }
 
     /**
      * @return bool Is this request setup for digest auth?
      */
-    public function hasDigestAuth()
-    {
+    public function hasDigestAuth() {
         return isset($this->password) && isset($this->username) && $this->additional_curl_opts[CURLOPT_HTTPAUTH] == CURLAUTH_DIGEST;
     }
 
@@ -154,15 +147,13 @@ 
      * @return Request $this
      * @param float|int $timeout seconds to timeout the HTTP call
      */
-    public function timeout($timeout)
-    {
+    public function timeout($timeout) {
         $this->timeout = $timeout;
         return $this;
     }
 
     // alias timeout
-    public function timeoutIn($seconds)
-    {
+    public function timeoutIn($seconds) {
         return $this->timeout($seconds);
     }
 
@@ -172,8 +163,7 @@ 
      * @return Request $this
      * @param bool|int $follow follow or not to follow or maximal number of redirects
      */
-    public function followRedirects($follow = true)
-    {
+    public function followRedirects($follow = true) {
         $this->max_redirects = $follow === true ? self::MAX_REDIRECTS_DEFAULT : max(0, $follow);
         $this->follow_redirects = (bool) $follow;
         return $this;
@@ -183,8 +173,7 @@ 
      * @return Request $this
      * @see Request::followRedirects()
      */
-    public function doNotFollowRedirects()
-    {
+    public function doNotFollowRedirects() {
         return $this->followRedirects(false);
     }
 
@@ -193,10 +182,10 @@ 
      * @return string|associative array of parsed results
      * @throws ConnectionErrorException when unable to parse or communicate w server
      */
-    public function send()
-    {
-        if (!$this->hasBeenInitialized())
-            $this->_curlPrep();
+    public function send() {
+        if (!$this->hasBeenInitialized()) {
+                    $this->_curlPrep();
+        }
 
         $result = curl_exec($this->_ch);
 
@@ -228,8 +217,7 @@ 
 
         return new Response($body, $headers, $this, $info);
     }
-    public function sendIt()
-    {
+    public function sendIt() {
         return $this->send();
     }
 
@@ -239,8 +227,7 @@ 
      * @return Request this
      * @param string $uri
      */
-    public function uri($uri)
-    {
+    public function uri($uri) {
         $this->uri = $uri;
         return $this;
     }
@@ -252,20 +239,17 @@ 
      * @param string $username
      * @param string $password
      */
-    public function basicAuth($username, $password)
-    {
+    public function basicAuth($username, $password) {
         $this->username = $username;
         $this->password = $password;
         return $this;
     }
     // @alias of basicAuth
-    public function authenticateWith($username, $password)
-    {
+    public function authenticateWith($username, $password) {
         return $this->basicAuth($username, $password);
     }
     // @alias of basicAuth
-    public function authenticateWithBasic($username, $password)
-    {
+    public function authenticateWithBasic($username, $password) {
         return $this->basicAuth($username, $password);
     }
 
@@ -275,23 +259,20 @@ 
      * @param string $username
      * @param string $password
      */
-    public function digestAuth($username, $password)
-    {
+    public function digestAuth($username, $password) {
         $this->addOnCurlOption(CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
         return $this->basicAuth($username, $password);
     }
 
     // @alias of digestAuth
-    public function authenticateWithDigest($username, $password)
-    {
+    public function authenticateWithDigest($username, $password) {
         return $this->digestAuth($username, $password);
     }
 
     /**
      * @return is this request setup for client side cert?
      */
-    public function hasClientSideCert()
-    {
+    public function hasClientSideCert() {
         return isset($this->client_cert) && isset($this->client_key);
     }
 
@@ -303,8 +284,7 @@ 
      * @param string $passphrase for client key
      * @param string $encoding default PEM
      */
-    public function clientSideCert($cert, $key, $passphrase = null, $encoding = 'PEM')
-    {
+    public function clientSideCert($cert, $key, $passphrase = null, $encoding = 'PEM') {
         $this->client_cert          = $cert;
         $this->client_key           = $key;
         $this->client_passphrase    = $passphrase;
@@ -313,8 +293,7 @@ 
         return $this;
     }
     // @alias of basicAuth
-    public function authenticateWithCert($cert, $key, $passphrase = null, $encoding = 'PEM')
-    {
+    public function authenticateWithCert($cert, $key, $passphrase = null, $encoding = 'PEM') {
         return $this->clientSideCert($cert, $key, $passphrase, $encoding);
     }
 
@@ -325,8 +304,7 @@ 
      * @param string $mimeType currently, sets the sends AND expects mime type although this
      *    behavior may change in the next minor release (as it is a potential breaking change).
      */
-    public function body($payload, $mimeType = null)
-    {
+    public function body($payload, $mimeType = null) {
         $this->mime($mimeType);
         $this->payload = $payload;
         // Iserntentially don't call _serializePayload yet.  Wait until
@@ -341,9 +319,10 @@ 
      * @return Request this
      * @param string $mime mime type to use for content type and expected return type
      */
-    public function mime($mime)
-    {
-        if (empty($mime)) return $this;
+    public function mime($mime) {
+        if (empty($mime)) {
+            return $this;
+        }
         $this->content_type = $this->expected_type = Mime::getFullMime($mime);
         if ($this->isUpload()) {
             $this->neverSerializePayload();
@@ -351,13 +330,11 @@ 
         return $this;
     }
     // @alias of mime
-    public function sendsAndExpectsType($mime)
-    {
+    public function sendsAndExpectsType($mime) {
         return $this->mime($mime);
     }
     // @alias of mime
-    public function sendsAndExpects($mime)
-    {
+    public function sendsAndExpects($mime) {
         return $this->mime($mime);
     }
 
@@ -367,9 +344,10 @@ 
      * @return Request this
      * @param string $method
      */
-    public function method($method)
-    {
-        if (empty($method)) return $this;
+    public function method($method) {
+        if (empty($method)) {
+            return $this;
+        }
         $this->method = $method;
         return $this;
     }
@@ -378,20 +356,19 @@ 
      * @return Request this
      * @param string $mime
      */
-    public function expects($mime)
-    {
-        if (empty($mime)) return $this;
+    public function expects($mime) {
+        if (empty($mime)) {
+            return $this;
+        }
         $this->expected_type = Mime::getFullMime($mime);
         return $this;
     }
     // @alias of expects
-    public function expectsType($mime)
-    {
+    public function expectsType($mime) {
         return $this->expects($mime);
     }
 
-    public function attach($files)
-    {
+    public function attach($files) {
         $finfo = finfo_open(FILEINFO_MIME_TYPE);
         foreach ($files as $key => $file) {
             $mimeType = finfo_file($finfo, $file);
@@ -409,9 +386,10 @@ 
      * @return Request this
      * @param string $mime
      */
-    public function contentType($mime)
-    {
-        if (empty($mime)) return $this;
+    public function contentType($mime) {
+        if (empty($mime)) {
+            return $this;
+        }
         $this->content_type  = Mime::getFullMime($mime);
         if ($this->isUpload()) {
             $this->neverSerializePayload();
@@ -419,13 +397,11 @@ 
         return $this;
     }
     // @alias of contentType
-    public function sends($mime)
-    {
+    public function sends($mime) {
         return $this->contentType($mime);
     }
     // @alias of contentType
-    public function sendsType($mime)
-    {
+    public function sendsType($mime) {
         return $this->contentType($mime);
     }
 
@@ -434,17 +410,14 @@ 
      * @return Request this
      * @param bool $strict
      */
-    public function strictSSL($strict)
-    {
+    public function strictSSL($strict) {
         $this->strict_ssl = $strict;
         return $this;
     }
-    public function withoutStrictSSL()
-    {
+    public function withoutStrictSSL() {
         return $this->strictSSL(false);
     }
-    public function withStrictSSL()
-    {
+    public function withStrictSSL() {
         return $this->strictSSL(true);
     }
 
@@ -457,8 +430,7 @@ 
      * @param string $auth_username Authentication username. Default null
      * @param string $auth_password Authentication password. Default null
      */
-    public function useProxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null, $proxy_type = Proxy::HTTP)
-    {
+    public function useProxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null, $proxy_type = Proxy::HTTP) {
         $this->addOnCurlOption(CURLOPT_PROXY, "{$proxy_host}:{$proxy_port}");
         $this->addOnCurlOption(CURLOPT_PROXYTYPE, $proxy_type);
         if (in_array($auth_type, array(CURLAUTH_BASIC,CURLAUTH_NTLM))) {
@@ -473,8 +445,7 @@ 
      * @see Request::useProxy
      * @return Request
      */
-    public function useSocks4Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null)
-    {
+    public function useSocks4Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null) {
         return $this->useProxy($proxy_host, $proxy_port, $auth_type, $auth_username, $auth_password, Proxy::SOCKS4);
     }
 
@@ -483,16 +454,14 @@ 
      * @see Request::useProxy
      * @return Request
      */
-    public function useSocks5Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null)
-    {
+    public function useSocks5Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null) {
         return $this->useProxy($proxy_host, $proxy_port, $auth_type, $auth_username, $auth_password, Proxy::SOCKS5);
     }
 
     /**
      * @return is this request setup for using proxy?
      */
-    public function hasProxy()
-    {
+    public function hasProxy() {
         return isset($this->additional_curl_opts[CURLOPT_PROXY]) && is_string($this->additional_curl_opts[CURLOPT_PROXY]);
     }
 
@@ -517,8 +486,7 @@ 
      * @return Request $this
      * @param int $mode
      */
-    public function serializePayload($mode)
-    {
+    public function serializePayload($mode) {
         $this->serialize_payload_method = $mode;
         return $this;
     }
@@ -527,8 +495,7 @@ 
      * @see Request::serializePayload()
      * @return Request
      */
-    public function neverSerializePayload()
-    {
+    public function neverSerializePayload() {
         return $this->serializePayload(self::SERIALIZE_PAYLOAD_NEVER);
     }
 
@@ -537,8 +504,7 @@ 
      * @see Request::serializePayload()
      * @return Request
      */
-    public function smartSerializePayload()
-    {
+    public function smartSerializePayload() {
         return $this->serializePayload(self::SERIALIZE_PAYLOAD_SMART);
     }
 
@@ -546,8 +512,7 @@ 
      * @see Request::serializePayload()
      * @return Request
      */
-    public function alwaysSerializePayload()
-    {
+    public function alwaysSerializePayload() {
         return $this->serializePayload(self::SERIALIZE_PAYLOAD_ALWAYS);
     }
 
@@ -561,8 +526,7 @@ 
      * @param string $header_name
      * @param string $value
      */
-    public function addHeader($header_name, $value)
-    {
+    public function addHeader($header_name, $value) {
         $this->headers[$header_name] = $value;
         return $this;
     }
@@ -575,8 +539,7 @@ 
      * @return Request $this
      * @param array $headers
      */
-    public function addHeaders(array $headers)
-    {
+    public function addHeaders(array $headers) {
         foreach ($headers as $header => $value) {
             $this->addHeader($header, $value);
         }
@@ -590,8 +553,7 @@ 
      *    If not auto parsing, Response->body returns the body
      *    as a string.
      */
-    public function autoParse($auto_parse = true)
-    {
+    public function autoParse($auto_parse = true) {
         $this->auto_parse = $auto_parse;
         return $this;
     }
@@ -600,8 +562,7 @@ 
      * @see Request::autoParse()
      * @return Request
      */
-    public function withoutAutoParsing()
-    {
+    public function withoutAutoParsing() {
         return $this->autoParse(false);
     }
 
@@ -609,8 +570,7 @@ 
      * @see Request::autoParse()
      * @return Request
      */
-    public function withAutoParsing()
-    {
+    public function withAutoParsing() {
         return $this->autoParse(true);
     }
 
@@ -620,8 +580,7 @@ 
      * @param \Closure $callback Takes the raw body of
      *    the http response and returns a mixed
      */
-    public function parseWith(\Closure $callback)
-    {
+    public function parseWith(\Closure $callback) {
         $this->parse_callback = $callback;
         return $this;
     }
@@ -631,8 +590,7 @@ 
      * @return Request $this
      * @param \Closure $callback
      */
-    public function parseResponsesWith(\Closure $callback)
-    {
+    public function parseResponsesWith(\Closure $callback) {
         return $this->parseWith($callback);
     }
 
@@ -642,8 +600,7 @@ 
      * @return Request
      * @param \Closure $callback (string $error)
      */
-    public function whenError(\Closure $callback)
-    {
+    public function whenError(\Closure $callback) {
         $this->error_callback = $callback;
         return $this;
     }
@@ -660,8 +617,7 @@ 
      * @param Closure $callback takes one argument, $payload,
      *    which is the payload that we'll be
      */
-    public function registerPayloadSerializer($mime, \Closure $callback)
-    {
+    public function registerPayloadSerializer($mime, \Closure $callback) {
         $this->payload_serializers[Mime::getFullMime($mime)] = $callback;
         return $this;
     }
@@ -671,8 +627,7 @@ 
      * @return Request $this
      * @param Closure $callback
      */
-    public function serializePayloadWith(\Closure $callback)
-    {
+    public function serializePayloadWith(\Closure $callback) {
         return $this->registerPayloadSerializer('*', $callback);
     }
 
@@ -691,8 +646,7 @@ 
      * @param array $args in this case, there should only ever be 1 argument provided
      *    and that argument should be a string value of the header we're setting
      */
-    public function __call($method, $args)
-    {
+    public function __call($method, $args) {
         // This method supports the sends* methods
         // like sendsJSON, sendsForm
         //!method_exists($this, $method) &&
@@ -719,15 +673,17 @@ 
 
         // This method also adds the custom header support as described in the
         // method comments
-        if (count($args) === 0)
-            return;
+        if (count($args) === 0) {
+                    return;
+        }
 
         // Strip the sugar.  If it leads with "with", strip.
         // This is okay because: No defined HTTP headers begin with with,
         // and if you are defining a custom header, the standard is to prefix it
         // with an "X-", so that should take care of any collisions.
-        if (substr($method, 0, 4) === 'with')
-            $method = substr($method, 4);
+        if (substr($method, 0, 4) === 'with') {
+                    $method = substr($method, 4);
+        }
 
         // Precede upper case letters with dashes, uppercase the first letter of method
         $header = ucwords(implode('-', preg_split('/([A-Z][^A-Z]*)/', $method, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)));
@@ -746,8 +702,7 @@ 
      * Request instantiation), it promotes readability
      * and flexibility within the class.
      */
-    private static function _initializeDefaults()
-    {
+    private static function _initializeDefaults() {
         // This is the only place you will
         // see this constructor syntax.  It
         // is only done here to prevent infinite
@@ -766,19 +721,19 @@ 
      * Doesn't copy variables prefixed with _
      * @return Request this
      */
-    private function _setDefaults()
-    {
-        if (!isset(self::$_template))
-            self::_initializeDefaults();
+    private function _setDefaults() {
+        if (!isset(self::$_template)) {
+                    self::_initializeDefaults();
+        }
         foreach (self::$_template as $k=>$v) {
-            if ($k[0] != '_')
-                $this->$k = $v;
+            if ($k[0] != '_') {
+                            $this->$k = $v;
+            }
         }
         return $this;
     }
 
-    private function _error($error)
-    {
+    private function _error($error) {
         // TODO add in support for various Loggers that follow
         // PSR 3 https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
         if (isset($this->error_callback)) {
@@ -796,14 +751,14 @@ 
      * @param string $method Http Method
      * @param string $mime Mime Type to Use
      */
-    public static function init($method = null, $mime = null)
-    {
+    public static function init($method = null, $mime = null) {
         // Setup our handlers, can call it here as it's idempotent
         Bootstrap::init();
 
         // Setup the default template if need be
-        if (!isset(self::$_template))
-            self::_initializeDefaults();
+        if (!isset(self::$_template)) {
+                    self::_initializeDefaults();
+        }
 
         $request = new Request();
         return $request
@@ -819,11 +774,11 @@ 
      * Note: It does NOT actually send the request
      * @return Request $this;
      */
-    public function _curlPrep()
-    {
+    public function _curlPrep() {
         // Check for required stuff
-        if (!isset($this->uri))
-            throw new \Exception('Attempting to send a request before defining a URI endpoint.');
+        if (!isset($this->uri)) {
+                    throw new \Exception('Attempting to send a request before defining a URI endpoint.');
+        }
 
         $ch = curl_init($this->uri);
 
@@ -838,11 +793,13 @@ 
 
         if ($this->hasClientSideCert()) {
 
-            if (!file_exists($this->client_key))
-                throw new \Exception('Could not read Client Key');
+            if (!file_exists($this->client_key)) {
+                            throw new \Exception('Could not read Client Key');
+            }
 
-            if (!file_exists($this->client_cert))
-                throw new \Exception('Could not read Client Certificate');
+            if (!file_exists($this->client_cert)) {
+                            throw new \Exception('Could not read Client Certificate');
+            }
 
             curl_setopt($ch, CURLOPT_SSLCERTTYPE,   $this->client_encoding);
             curl_setopt($ch, CURLOPT_SSLKEYTYPE,    $this->client_encoding);
@@ -869,7 +826,9 @@ 
         // zero is safe for all curl versions
         $verifyValue = $this->strict_ssl + 0;
         //Support for value 1 removed in cURL 7.28.1 value 2 valid in all versions
-        if ($verifyValue > 0) $verifyValue++;
+        if ($verifyValue > 0) {
+            $verifyValue++;
+        }
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $verifyValue);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -947,8 +906,7 @@ 
      * @return int length of payload in bytes
      * @param string $str payload
      */
-    public function _determineLength($str)
-    {
+    public function _determineLength($str) {
         if (function_exists('mb_strlen')) {
             return mb_strlen($str, '8bit');
         } else {
@@ -959,16 +917,14 @@ 
     /**
      * @return bool
      */
-    public function isUpload()
-    {
+    public function isUpload() {
         return Mime::UPLOAD == $this->content_type;
     }
 
     /**
      * @return string
      */
-    public function buildUserAgent()
-    {
+    public function buildUserAgent() {
         $user_agent = 'User-Agent: Httpful/' . Httpful::VERSION . ' (cURL/';
         $curl = \curl_version();
 
@@ -1009,8 +965,7 @@ 
      * @param string $curlopt
      * @param mixed $curloptval
      */
-    public function addOnCurlOption($curlopt, $curloptval)
-    {
+    public function addOnCurlOption($curlopt, $curloptval) {
         $this->additional_curl_opts[$curlopt] = $curloptval;
         return $this;
     }
@@ -1030,14 +985,15 @@ 
      * @return string
      * @param mixed $payload
      */
-    private function _serializePayload($payload)
-    {
-        if (empty($payload) || $this->serialize_payload_method === self::SERIALIZE_PAYLOAD_NEVER)
-            return $payload;
+    private function _serializePayload($payload) {
+        if (empty($payload) || $this->serialize_payload_method === self::SERIALIZE_PAYLOAD_NEVER) {
+                    return $payload;
+        }
 
         // When we are in "smart" mode, don't serialize strings/scalars, assume they are already serialized
-        if ($this->serialize_payload_method === self::SERIALIZE_PAYLOAD_SMART && is_scalar($payload))
-            return $payload;
+        if ($this->serialize_payload_method === self::SERIALIZE_PAYLOAD_SMART && is_scalar($payload)) {
+                    return $payload;
+        }
 
         // Use a custom serializer if one is registered for this mime type
         if (isset($this->payload_serializers['*']) || isset($this->payload_serializers[$this->content_type])) {
@@ -1054,8 +1010,7 @@ 
      * @param string $uri optional uri to use
      * @param string $mime expected
      */
-    public static function get($uri, $mime = null)
-    {
+    public static function get($uri, $mime = null) {
         return self::init(Http::GET)->uri($uri)->mime($mime);
     }
 
@@ -1067,8 +1022,7 @@ 
      * @param string $uri optional uri to use
      * @param string $mime expected
      */
-    public static function getQuick($uri, $mime = null)
-    {
+    public static function getQuick($uri, $mime = null) {
         return self::get($uri, $mime)->send();
     }
 
@@ -1079,8 +1033,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function post($uri, $payload = null, $mime = null)
-    {
+    public static function post($uri, $payload = null, $mime = null) {
         return self::init(Http::POST)->uri($uri)->body($payload, $mime);
     }
 
@@ -1091,8 +1044,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function put($uri, $payload = null, $mime = null)
-    {
+    public static function put($uri, $payload = null, $mime = null) {
         return self::init(Http::PUT)->uri($uri)->body($payload, $mime);
     }
 
@@ -1103,8 +1055,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function patch($uri, $payload = null, $mime = null)
-    {
+    public static function patch($uri, $payload = null, $mime = null) {
         return self::init(Http::PATCH)->uri($uri)->body($payload, $mime);
     }
 
@@ -1113,8 +1064,7 @@ 
      * @return Request
      * @param string $uri optional uri to use
      */
-    public static function delete($uri, $mime = null)
-    {
+    public static function delete($uri, $mime = null) {
         return self::init(Http::DELETE)->uri($uri)->mime($mime);
     }
 
@@ -1123,8 +1073,7 @@ 
      * @return Request
      * @param string $uri optional uri to use
      */
-    public static function head($uri)
-    {
+    public static function head($uri) {
         return self::init(Http::HEAD)->uri($uri);
     }
 
@@ -1133,8 +1082,7 @@ 
      * @return Request
      * @param string $uri optional uri to use
      */
-    public static function options($uri)
-    {
+    public static function options($uri) {
         return self::init(Http::OPTIONS)->uri($uri);
     }
 }

Upper-Lower-Casing +30 added lines, -30 removed lines

@@ -32,11 +32,11 @@ 
            $method                  = Http::GET,
            $headers                 = array(),
            $raw_headers             = '',
-           $strict_ssl              = false,
+           $strict_ssl              = FALSE,
            $content_type,
            $expected_type,
            $additional_curl_opts    = array(),
-           $auto_parse              = true,
+           $auto_parse              = TRUE,
            $serialize_payload_method = self::SERIALIZE_PAYLOAD_SMART,
            $username,
            $password,
@@ -44,7 +44,7 @@ 
            $payload,
            $parse_callback,
            $error_callback,
-           $follow_redirects        = false,
+           $follow_redirects        = FALSE,
            $max_redirects           = self::MAX_REDIRECTS_DEFAULT,
            $payload_serializers     = array();
 
@@ -68,7 +68,7 @@ 
      * for internal use.
      * @param array $attrs hash of initial attribute values
      */
-    private function __construct($attrs = null)
+    private function __construct($attrs = NULL)
     {
         if (!is_array($attrs)) return;
         foreach ($attrs as $attr => $value) {
@@ -172,9 +172,9 @@ 
      * @return Request $this
      * @param bool|int $follow follow or not to follow or maximal number of redirects
      */
-    public function followRedirects($follow = true)
+    public function followRedirects($follow = TRUE)
     {
-        $this->max_redirects = $follow === true ? self::MAX_REDIRECTS_DEFAULT : max(0, $follow);
+        $this->max_redirects = $follow === TRUE ? self::MAX_REDIRECTS_DEFAULT : max(0, $follow);
         $this->follow_redirects = (bool) $follow;
         return $this;
     }
@@ -185,7 +185,7 @@ 
      */
     public function doNotFollowRedirects()
     {
-        return $this->followRedirects(false);
+        return $this->followRedirects(FALSE);
     }
 
     /**
@@ -200,7 +200,7 @@ 
 
         $result = curl_exec($this->_ch);
 
-        if ($result === false) {
+        if ($result === FALSE) {
             if ($curlErrorNumber = curl_errno($this->_ch)) {
                 $curlErrorString = curl_error($this->_ch);
                 $this->_error($curlErrorString);
@@ -303,7 +303,7 @@ 
      * @param string $passphrase for client key
      * @param string $encoding default PEM
      */
-    public function clientSideCert($cert, $key, $passphrase = null, $encoding = 'PEM')
+    public function clientSideCert($cert, $key, $passphrase = NULL, $encoding = 'PEM')
     {
         $this->client_cert          = $cert;
         $this->client_key           = $key;
@@ -313,7 +313,7 @@ 
         return $this;
     }
     // @alias of basicAuth
-    public function authenticateWithCert($cert, $key, $passphrase = null, $encoding = 'PEM')
+    public function authenticateWithCert($cert, $key, $passphrase = NULL, $encoding = 'PEM')
     {
         return $this->clientSideCert($cert, $key, $passphrase, $encoding);
     }
@@ -325,7 +325,7 @@ 
      * @param string $mimeType currently, sets the sends AND expects mime type although this
      *    behavior may change in the next minor release (as it is a potential breaking change).
      */
-    public function body($payload, $mimeType = null)
+    public function body($payload, $mimeType = NULL)
     {
         $this->mime($mimeType);
         $this->payload = $payload;
@@ -441,11 +441,11 @@ 
     }
     public function withoutStrictSSL()
     {
-        return $this->strictSSL(false);
+        return $this->strictSSL(FALSE);
     }
     public function withStrictSSL()
     {
-        return $this->strictSSL(true);
+        return $this->strictSSL(TRUE);
     }
 
     /**
@@ -457,7 +457,7 @@ 
      * @param string $auth_username Authentication username. Default null
      * @param string $auth_password Authentication password. Default null
      */
-    public function useProxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null, $proxy_type = Proxy::HTTP)
+    public function useProxy($proxy_host, $proxy_port = 80, $auth_type = NULL, $auth_username = NULL, $auth_password = NULL, $proxy_type = Proxy::HTTP)
     {
         $this->addOnCurlOption(CURLOPT_PROXY, "{$proxy_host}:{$proxy_port}");
         $this->addOnCurlOption(CURLOPT_PROXYTYPE, $proxy_type);
@@ -473,7 +473,7 @@ 
      * @see Request::useProxy
      * @return Request
      */
-    public function useSocks4Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null)
+    public function useSocks4Proxy($proxy_host, $proxy_port = 80, $auth_type = NULL, $auth_username = NULL, $auth_password = NULL)
     {
         return $this->useProxy($proxy_host, $proxy_port, $auth_type, $auth_username, $auth_password, Proxy::SOCKS4);
     }
@@ -483,7 +483,7 @@ 
      * @see Request::useProxy
      * @return Request
      */
-    public function useSocks5Proxy($proxy_host, $proxy_port = 80, $auth_type = null, $auth_username = null, $auth_password = null)
+    public function useSocks5Proxy($proxy_host, $proxy_port = 80, $auth_type = NULL, $auth_username = NULL, $auth_password = NULL)
     {
         return $this->useProxy($proxy_host, $proxy_port, $auth_type, $auth_username, $auth_password, Proxy::SOCKS5);
     }
@@ -590,7 +590,7 @@ 
      *    If not auto parsing, Response->body returns the body
      *    as a string.
      */
-    public function autoParse($auto_parse = true)
+    public function autoParse($auto_parse = TRUE)
     {
         $this->auto_parse = $auto_parse;
         return $this;
@@ -602,7 +602,7 @@ 
      */
     public function withoutAutoParsing()
     {
-        return $this->autoParse(false);
+        return $this->autoParse(FALSE);
     }
 
     /**
@@ -611,7 +611,7 @@ 
      */
     public function withAutoParsing()
     {
-        return $this->autoParse(true);
+        return $this->autoParse(TRUE);
     }
 
     /**
@@ -796,7 +796,7 @@ 
      * @param string $method Http Method
      * @param string $mime Mime Type to Use
      */
-    public static function init($method = null, $mime = null)
+    public static function init($method = NULL, $mime = NULL)
     {
         // Setup our handlers, can call it here as it's idempotent
         Bootstrap::init();
@@ -829,7 +829,7 @@ 
 
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->method);
         if ($this->method === Http::HEAD) {
-            curl_setopt($ch, CURLOPT_NOBODY, true);
+            curl_setopt($ch, CURLOPT_NOBODY, TRUE);
         }
 
         if ($this->hasBasicAuth()) {
@@ -861,7 +861,7 @@ 
         }
 
         if ($this->follow_redirects) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
             curl_setopt($ch, CURLOPT_MAXREDIRS, $this->max_redirects);
         }
 
@@ -871,7 +871,7 @@ 
         //Support for value 1 removed in cURL 7.28.1 value 2 valid in all versions
         if ($verifyValue > 0) $verifyValue++;
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $verifyValue);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
 
         // https://github.com/nategood/httpful/issues/84
         // set Content-Length to the size of the payload if present
@@ -927,7 +927,7 @@ 
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
         if ($this->_debug) {
-            curl_setopt($ch, CURLOPT_VERBOSE, true);
+            curl_setopt($ch, CURLOPT_VERBOSE, TRUE);
         }
 
         curl_setopt($ch, CURLOPT_HEADER, 1);
@@ -1054,7 +1054,7 @@ 
      * @param string $uri optional uri to use
      * @param string $mime expected
      */
-    public static function get($uri, $mime = null)
+    public static function get($uri, $mime = NULL)
     {
         return self::init(Http::GET)->uri($uri)->mime($mime);
     }
@@ -1067,7 +1067,7 @@ 
      * @param string $uri optional uri to use
      * @param string $mime expected
      */
-    public static function getQuick($uri, $mime = null)
+    public static function getQuick($uri, $mime = NULL)
     {
         return self::get($uri, $mime)->send();
     }
@@ -1079,7 +1079,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function post($uri, $payload = null, $mime = null)
+    public static function post($uri, $payload = NULL, $mime = NULL)
     {
         return self::init(Http::POST)->uri($uri)->body($payload, $mime);
     }
@@ -1091,7 +1091,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function put($uri, $payload = null, $mime = null)
+    public static function put($uri, $payload = NULL, $mime = NULL)
     {
         return self::init(Http::PUT)->uri($uri)->body($payload, $mime);
     }
@@ -1103,7 +1103,7 @@ 
      * @param string $payload data to send in body of request
      * @param string $mime MIME to use for Content-Type
      */
-    public static function patch($uri, $payload = null, $mime = null)
+    public static function patch($uri, $payload = NULL, $mime = NULL)
     {
         return self::init(Http::PATCH)->uri($uri)->body($payload, $mime);
     }
@@ -1113,7 +1113,7 @@ 
      * @return Request
      * @param string $uri optional uri to use
      */
-    public static function delete($uri, $mime = null)
+    public static function delete($uri, $mime = NULL)
     {
         return self::init(Http::DELETE)->uri($uri)->mime($mime);
     }

Classes/Controller/GetFileController.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 
         switch ($piVars['action']) {
             case 'mets':
-                $path = rtrim('http://' . $fedoraHost,"/").'/fedora/objects/'.$piVars['qid'].'/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
+                $path = rtrim('http://' . $fedoraHost, "/") . '/fedora/objects/' . $piVars['qid'] . '/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
                 break;
 
             case 'preview':
@@ -137,13 +137,13 @@ 
 
                 $qid = $piVars['qid'];
                 $source = explode(':', $qid);
-                if($source[0] == 'qucosa') {
+                if ($source[0] == 'qucosa') {
 
-                    $path = rtrim('http://' . $fedoraHost,"/").'/fedora/objects/'.$piVars['qid'].'/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
+                    $path = rtrim('http://' . $fedoraHost, "/") . '/fedora/objects/' . $piVars['qid'] . '/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
                     $metsXml = str_replace('&', '&', file_get_contents($path));
                     $dataCiteXml = \EWW\Dpf\Helper\DataCiteXml::convertFromMetsXml($metsXml);
 
-                } elseif($document = $this->documentRepository->findByUid($piVars['qid'])) {
+                } elseif ($document = $this->documentRepository->findByUid($piVars['qid'])) {
 
                     $metsXml = str_replace('&', '&', $this->buildMetsXml($document));
                     $dataCiteXml = \EWW\Dpf\Helper\DataCiteXml::convertFromMetsXml($metsXml);

Braces +4 added lines, -8 removed lines

@@ -46,8 +46,7 @@ 
 /**
  * GetFileController
  */
-class GetFileController extends \EWW\Dpf\Controller\AbstractController
-{
+class GetFileController extends \EWW\Dpf\Controller\AbstractController {
 
     /**
      * documentRepository
@@ -65,8 +64,7 @@ 
      */
     protected $clientConfigurationManager;
 
-    public function attachmentAction()
-    {
+    public function attachmentAction() {
 
         $piVars = GeneralUtility::_GP('tx_dpf'); // get GET params from powermail
 
@@ -232,8 +230,7 @@ 
 
     }
 
-    private static function sanitizeFilename($filename)
-    {
+    private static function sanitizeFilename($filename) {
         // remove anything which isn't a word, whitespace, number or any of the following caracters -_~,;[]().
         $filename = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $filename);
         // turn diacritical characters to ASCII
@@ -245,8 +242,7 @@ 
         return $filename;
     }
 
-    private function buildMetsXml($document)
-    {
+    private function buildMetsXml($document) {
 
         $exporter = new \EWW\Dpf\Services\MetsExporter();
         $fileData = $document->getCurrentFileData();

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -179,20 +179,20 @@
             return 'Error while fetching headers';
         }
 
-        $contentDispFlag = false;
-        $contentTypeFlag = false;
+        $contentDispFlag = FALSE;
+        $contentTypeFlag = FALSE;
 
         foreach ($headers as $value) {
 
             if (FALSE !== stripos($value, 'Content-Disposition')) {
                 header($value);
-                $contentDispFlag = true;
+                $contentDispFlag = TRUE;
                 continue;
             }
 
             if (FALSE !== stripos($value, 'Content-Type')) {
                 header($value);
-                $contentTypeFlag = true;
+                $contentTypeFlag = TRUE;
                 continue;
             }
 

Classes/Domain/Model/ProcessNumber.php

Spacing +1 added lines, -1 removed lines

@@ -106,6 +106,6 @@
     }
 
     public function getProcessNumberString() {
-        return strtoupper($this->getOwnerId()).'-'. $this->getYear().'-'.$this->getCounter();
+        return strtoupper($this->getOwnerId()) . '-' . $this->getYear() . '-' . $this->getCounter();
     }
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -47,8 +47,7 @@ 
      *
      * @return string $ownerId
      */
-    public function getOwnerId()
-    {
+    public function getOwnerId() {
         return $this->ownerId;
     }
 
@@ -58,8 +57,7 @@ 
      * @param string $ownerId
      * @return void
      */
-    public function setOwnerId($ownerId)
-    {
+    public function setOwnerId($ownerId) {
         $this->ownerId = $ownerId;
     }
 
@@ -68,8 +66,7 @@ 
      *
      * @return int $year
      */
-    public function getYear()
-    {
+    public function getYear() {
         return $this->year;
     }
 
@@ -79,8 +76,7 @@ 
      * @param int $year
      * @return void
      */
-    public function setYear($year)
-    {
+    public function setYear($year) {
         $this->year = $year;
     }
 
@@ -89,8 +85,7 @@ 
      *
      * @return int $counter
      */
-    public function getCounter()
-    {
+    public function getCounter() {
         return $this->counter;
     }
 
@@ -100,8 +95,7 @@ 
      * @param int $counter
      * @return void
      */
-    public function setCounter($counter)
-    {
+    public function setCounter($counter) {
         $this->counter = $counter;
     }
 

Classes/Plugins/DownloadTool/DownloadTool.php

Indentation -1 removed lines

@@ -107,7 +107,6 @@
 
     /**
      * Get PDF document list
-
      * @return array of attachments
      */
     protected function getAttachments()

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 
             foreach ($attachments as $id => $file) {
 
-                $conf = array(
+                $conf = array (
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
@@ -120,13 +120,13 @@ 
 
         if (!is_array($files)) {
 
-            return array();
+            return array ();
 
         }
 
         foreach ($files as $key => $file) {
 
-            $singleFile = array();
+            $singleFile = array ();
 
             foreach ($file->attributes('mext', 1) as $attribute => $value) {
 

Braces +3 added lines, -6 removed lines

@@ -22,8 +22,7 @@ 
  * @subpackage    tx_dpf
  * @access    public
  */
-class DownloadTool extends \tx_dlf_plugin
-{
+class DownloadTool extends \tx_dlf_plugin {
 
     /**
      * The main method of the PlugIn
@@ -35,8 +34,7 @@ 
      *
      * @return    string        The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
 
         $this->init($conf);
 
@@ -110,8 +108,7 @@ 
 
      * @return array of attachments
      */
-    protected function getAttachments()
-    {
+    protected function getAttachments() {
 
         // Get pdf documents
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 
         if (is_array($dpfTSconfig['settings.'])) {
 
-            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, true, false);
+            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, TRUE, FALSE);
             $this->conf = $dpfTSconfig['settings.'];
 
         }
@@ -54,7 +54,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === null || empty($this->conf['fileGrpDownload'])) {
+        if ($this->doc === NULL || empty($this->conf['fileGrpDownload'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -87,7 +87,7 @@ 
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
-                    'forceAbsoluteUrl' => true,
+                    'forceAbsoluteUrl' => TRUE,
                 );
 
                 $title = $file['LABEL'] ? $file['LABEL'] : $file['ID'];
@@ -101,7 +101,7 @@ 
 
         }
 
-        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, true);
+        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, TRUE);
 
     }
 

Classes/Configuration/ClientConfigurationManager.php

Indentation +32 added lines, -32 removed lines

@@ -17,7 +17,7 @@ 
 class ClientConfigurationManager 
 {
 
-	/**
+    /**
      * objectManager
      *
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
@@ -57,11 +57,11 @@ 
    
     public function __construct()
     {
-    	$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\Object\\ObjectManager');
+        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\Object\\ObjectManager');
         $clientRepository = $objectManager->get("EWW\\Dpf\\Domain\\Repository\\ClientRepository");
 
-		if (TYPO3_MODE === 'BE')
-		{
+        if (TYPO3_MODE === 'BE')
+        {
             $selectedPageId = (int) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
             if ($selectedPageId)
             {
@@ -72,15 +72,15 @@ 
                 $this->settings = $settings; //['settings'];
             }
 
-		}
-		else
-		{
+        }
+        else
+        {
             $this->client = $clientRepository->findAll()->current();
 
-    		$configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager');
-    		$this->settings = $configurationManager->getConfiguration(
-            	\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS
-        	);
+            $configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager');
+            $this->settings = $configurationManager->getConfiguration(
+                \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS
+            );
 
         }
 
@@ -111,57 +111,57 @@ 
 
     public function getSwordHost()
     { 
-    	return $this->getSetting("swordHost","swordHost");
+        return $this->getSetting("swordHost","swordHost");
     }
 
-	public function getSwordUser()
+    public function getSwordUser()
     { 
-    	return $this->getSetting("swordUser","swordUser");
+        return $this->getSetting("swordUser","swordUser");
     }
 
-	public function getSwordPassword()
+    public function getSwordPassword()
     { 
-    	return $this->getSetting("swordPassword","swordPassword");
+        return $this->getSetting("swordPassword","swordPassword");
     }
 
-	public function getSwordCollectionNamespace()
+    public function getSwordCollectionNamespace()
     { 
-    	return $this->getSetting("swordCollectionNamespace","swordCollectionNamespace");
+        return $this->getSetting("swordCollectionNamespace","swordCollectionNamespace");
     }
 
-	public function getFedoraHost()
+    public function getFedoraHost()
     { 
-    	return $this->getSetting("fedoraHost","fedoraHost");
+        return $this->getSetting("fedoraHost","fedoraHost");
     }
 
-	public function getFedoraUser()
+    public function getFedoraUser()
     { 
-    	return $this->getSetting("fedoraUser","fedoraUser");
+        return $this->getSetting("fedoraUser","fedoraUser");
     }
 
-	public function getFedoraPassword()
+    public function getFedoraPassword()
     { 
-    	return $this->getSetting("fedoraPassword","fedoraPassword");
+        return $this->getSetting("fedoraPassword","fedoraPassword");
     }
 
-	public function getElasticSearchHost()
+    public function getElasticSearchHost()
     { 
-    	return $this->getSetting("elasticSearchHost","elasticSearchHost");
+        return $this->getSetting("elasticSearchHost","elasticSearchHost");
     }
 
-	public function getElasticSearchPort()
+    public function getElasticSearchPort()
     { 
-    	return $this->getSetting("elasticSearchPort","elasticSearchPort");
+        return $this->getSetting("elasticSearchPort","elasticSearchPort");
     }
 
-	public function getUploadDirectory()
+    public function getUploadDirectory()
     { 
-    	return $this->getSetting("uploadDirectory","uploadDirectory");
+        return $this->getSetting("uploadDirectory","uploadDirectory");
     }
 
-	public function getUploadDomain()
+    public function getUploadDomain()
     { 
-    	return $this->getSetting("uploadDomain","uploadDomain");
+        return $this->getSetting("uploadDomain","uploadDomain");
     }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -38,7 +38,7 @@ 
      *
      * @var array
      */
-    protected $settings = array();
+    protected $settings = array ();
 
 
     /**
@@ -53,7 +53,7 @@ 
      *
      * @var array
      */
-    protected $extensionConfiguration = array();
+    protected $extensionConfiguration = array ();
    
     public function __construct()
     {
@@ -68,7 +68,7 @@ 
                 $this->client = $clientRepository->findAll()->current();
 
                 $configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\BackendConfigurationManager');
-                $settings = $configurationManager->getConfiguration(NULL,NULL);
+                $settings = $configurationManager->getConfiguration(NULL, NULL);
                 $this->settings = $settings; //['settings'];
             }
 
@@ -93,7 +93,7 @@ 
         $setting = NULL;
         if ($this->client)
         {
-            $setting = trim($this->client->{"get".ucfirst($settingName)}());
+            $setting = trim($this->client->{"get" . ucfirst($settingName)}());
             if (!(is_string($setting) && $setting != "") && $extConfig)
             {
                 $setting = trim($this->extensionConfiguration[$extConfig]);
@@ -111,57 +111,57 @@ 
 
     public function getSwordHost()
     { 
-    	return $this->getSetting("swordHost","swordHost");
+    	return $this->getSetting("swordHost", "swordHost");
     }
 
 	public function getSwordUser()
     { 
-    	return $this->getSetting("swordUser","swordUser");
+    	return $this->getSetting("swordUser", "swordUser");
     }
 
 	public function getSwordPassword()
     { 
-    	return $this->getSetting("swordPassword","swordPassword");
+    	return $this->getSetting("swordPassword", "swordPassword");
     }
 
 	public function getSwordCollectionNamespace()
     { 
-    	return $this->getSetting("swordCollectionNamespace","swordCollectionNamespace");
+    	return $this->getSetting("swordCollectionNamespace", "swordCollectionNamespace");
     }
 
 	public function getFedoraHost()
     { 
-    	return $this->getSetting("fedoraHost","fedoraHost");
+    	return $this->getSetting("fedoraHost", "fedoraHost");
     }
 
 	public function getFedoraUser()
     { 
-    	return $this->getSetting("fedoraUser","fedoraUser");
+    	return $this->getSetting("fedoraUser", "fedoraUser");
     }
 
 	public function getFedoraPassword()
     { 
-    	return $this->getSetting("fedoraPassword","fedoraPassword");
+    	return $this->getSetting("fedoraPassword", "fedoraPassword");
     }
 
 	public function getElasticSearchHost()
     { 
-    	return $this->getSetting("elasticSearchHost","elasticSearchHost");
+    	return $this->getSetting("elasticSearchHost", "elasticSearchHost");
     }
 
 	public function getElasticSearchPort()
     { 
-    	return $this->getSetting("elasticSearchPort","elasticSearchPort");
+    	return $this->getSetting("elasticSearchPort", "elasticSearchPort");
     }
 
 	public function getUploadDirectory()
     { 
-    	return $this->getSetting("uploadDirectory","uploadDirectory");
+    	return $this->getSetting("uploadDirectory", "uploadDirectory");
     }
 
 	public function getUploadDomain()
     { 
-    	return $this->getSetting("uploadDomain","uploadDomain");
+    	return $this->getSetting("uploadDomain", "uploadDomain");
     }
 
 }

Braces +20 added lines, -41 removed lines

@@ -14,8 +14,7 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class ClientConfigurationManager 
-{
+class ClientConfigurationManager {
 
 	/**
      * objectManager
@@ -55,16 +54,13 @@ 
      */
     protected $extensionConfiguration = array();
    
-    public function __construct()
-    {
+    public function __construct() {
     	$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\Object\\ObjectManager');
         $clientRepository = $objectManager->get("EWW\\Dpf\\Domain\\Repository\\ClientRepository");
 
-		if (TYPO3_MODE === 'BE')
-		{
+		if (TYPO3_MODE === 'BE') {
             $selectedPageId = (int) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
-            if ($selectedPageId)
-            {
+            if ($selectedPageId) {
                 $this->client = $clientRepository->findAll()->current();
 
                 $configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\BackendConfigurationManager');
@@ -72,9 +68,7 @@ 
                 $this->settings = $settings; //['settings'];
             }
 
-		}
-		else
-		{
+		} else {
             $this->client = $clientRepository->findAll()->current();
 
     		$configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager');
@@ -88,14 +82,11 @@ 
     }	
    
 
-    public function getSetting($settingName, $extConfig = NULL)
-    {
+    public function getSetting($settingName, $extConfig = NULL) {
         $setting = NULL;
-        if ($this->client)
-        {
+        if ($this->client) {
             $setting = trim($this->client->{"get".ucfirst($settingName)}());
-            if (!(is_string($setting) && $setting != "") && $extConfig)
-            {
+            if (!(is_string($setting) && $setting != "") && $extConfig) {
                 $setting = trim($this->extensionConfiguration[$extConfig]);
             }
         }
@@ -104,63 +95,51 @@ 
     }
 
 
-    public function getOwnerId()
-    {
+    public function getOwnerId() {
         return $this->getSetting("ownerId");
     }
 
-    public function getSwordHost()
-    { 
+    public function getSwordHost() {
     	return $this->getSetting("swordHost","swordHost");
     }
 
-	public function getSwordUser()
-    { 
+	public function getSwordUser() {
     	return $this->getSetting("swordUser","swordUser");
     }
 
-	public function getSwordPassword()
-    { 
+	public function getSwordPassword() {
     	return $this->getSetting("swordPassword","swordPassword");
     }
 
-	public function getSwordCollectionNamespace()
-    { 
+	public function getSwordCollectionNamespace() {
     	return $this->getSetting("swordCollectionNamespace","swordCollectionNamespace");
     }
 
-	public function getFedoraHost()
-    { 
+	public function getFedoraHost() {
     	return $this->getSetting("fedoraHost","fedoraHost");
     }
 
-	public function getFedoraUser()
-    { 
+	public function getFedoraUser() {
     	return $this->getSetting("fedoraUser","fedoraUser");
     }
 
-	public function getFedoraPassword()
-    { 
+	public function getFedoraPassword() {
     	return $this->getSetting("fedoraPassword","fedoraPassword");
     }
 
-	public function getElasticSearchHost()
-    { 
+	public function getElasticSearchHost() {
     	return $this->getSetting("elasticSearchHost","elasticSearchHost");
     }
 
-	public function getElasticSearchPort()
-    { 
+	public function getElasticSearchPort() {
     	return $this->getSetting("elasticSearchPort","elasticSearchPort");
     }
 
-	public function getUploadDirectory()
-    { 
+	public function getUploadDirectory() {
     	return $this->getSetting("uploadDirectory","uploadDirectory");
     }
 
-	public function getUploadDomain()
-    { 
+	public function getUploadDomain() {
     	return $this->getSetting("uploadDomain","uploadDomain");
     }
 

Classes/Services/parser/src/nbsp/bitter/Tokens/CSS.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
         return Lexer::extend($this->comment(), [
             'block'     => [
                 Lexer::MATCH => '[{]',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     $out->startToken('type structure');
 
                     $begin = $token;
@@ -41,7 +41,7 @@ 
 
             'predicate' => [
                 Lexer::MATCH => '\[',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     $out->startToken('predicate');
 
                     $begin = $token;
@@ -68,7 +68,7 @@ 
 
             'selector'  => [
                 Lexer::MATCH => '([.:#]|[:]{2})[a-z0-9_-]+',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     Lexer::choose($in, $out, $token, [
                         [
                             Lexer::MATCH => '%^[.]%i',
@@ -127,7 +127,7 @@ 
 
             'method' => [
                 Lexer::MATCH => '[a-z0-9_-]+\s*(?=[(])',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     $begin = $token;
                     $out->writeToken($begin, 'word method');
 
@@ -156,7 +156,7 @@ 
         return [
             'comment' => [
                 Lexer::MATCH => '/[*].*?[*]/',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     $out->startToken('comment block');
 
                     $in = new Input();
@@ -209,7 +209,7 @@ 
 
             'value'    => [
                 Lexer::MATCH => ':',
-                Lexer::CALL  => function ($in, $out, $token) {
+                Lexer::CALL  => function($in, $out, $token) {
                     $begin = $token;
                     $out->writeRaw($begin);
 

Braces +7 added lines, -14 removed lines

@@ -12,10 +12,8 @@ 
 use nbsp\bitter\Input;
 use nbsp\bitter\Lexer;
 
-trait CSS
-{
-    public function tokens()
-    {
+trait CSS {
+    public function tokens() {
         return Lexer::extend($this->comment(), [
             'block'     => [
                 Lexer::MATCH => '[{]',
@@ -102,8 +100,7 @@ 
      *
      * @return array
      */
-    public function common()
-    {
+    public function common() {
         return Lexer::extend($this->comment(), [
             'colour' => [
                 Lexer::MATCH => '[#]([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b',
@@ -151,8 +148,7 @@ 
      *
      * @return array
      */
-    public function comment()
-    {
+    public function comment() {
         return [
             'comment' => [
                 Lexer::MATCH => '/[*].*?[*]/',
@@ -194,8 +190,7 @@ 
         ];
     }
 
-    public function block()
-    {
+    public function block() {
         return Lexer::extend($this->comment(), [
             'end'      => [
                 Lexer::MATCH => '[}]',
@@ -228,8 +223,7 @@ 
         ]);
     }
 
-    public function method()
-    {
+    public function method() {
         return Lexer::extend($this->common(), [
             'end' => [
                 Lexer::MATCH => '[)]',
@@ -238,8 +232,7 @@ 
         ]);
     }
 
-    public function value()
-    {
+    public function value() {
         return Lexer::extend($this->common(), [
             'end' => [
                 Lexer::MATCH => ';',