cs fixes

Author: dbu

inc/FixtureLoaderInterface.php

@@ -15,10 +15,8 @@ interface FixtureLoaderInterface
      *
      * Default fixtures in the jcr system view format live folder fixtures/
      *
-     * @param string $fixture the fixtures "name", i.e. "general/base"
+     * @param string $fixture      the fixtures "name", i.e. "general/base"
      * @param string $workspaceKey the config key for the target workspace, optional
-     *
-     * @return void
      */
     public function import($fixture, $workspaceKey = 'workspace');
 }

tests/04_Connecting/SimpleCredentialsTest.php

@@ -22,6 +22,7 @@ protected function assertSimpleCredentials($user, $password)
     {
         $cr = new \PHPCR\SimpleCredentials($user, $password);
         $this->assertInstanceOf('PHPCR\CredentialsInterface', $cr);
+
         return $cr;
     }
 

tests/04_Connecting/WorkspaceReadMethodsTest.php

@@ -17,7 +17,7 @@ class WorkspaceReadMethodsTest extends \PHPCR\Test\BaseCase
 
     //4.5 Workspace Read Methods
 
-    function setUp()
+    public function setUp()
     {
         parent::setUp();
         $this->workspace = $this->sharedFixture['session']->getWorkspace();

tests/05_Reading/EncodingTest.php

@@ -10,7 +10,7 @@
 class EncodingTest extends \PHPCR\Test\BaseCase
 {
 
-    static public function setupBeforeClass($fixtures = '05_Reading/encoding')
+    public static function setupBeforeClass($fixtures = '05_Reading/encoding')
     {
         parent::setupBeforeClass($fixtures);
     }

tests/05_Reading/NodeReadMethodsTest.php

@@ -155,7 +155,7 @@ public function testGetNodes()
         $this->assertInstanceOf('Countable', $iterator);
 
         $this->assertCount(8, $iterator);
-        foreach($iterator as $node) {
+        foreach ($iterator as $node) {
             $this->assertInstanceOf('PHPCR\NodeInterface', $node);
         }
     }
@@ -245,7 +245,7 @@ public function testGetNodeNames()
         $this->assertInstanceOf('Iterator', $iterator);
 
         $names = array();
-        foreach($iterator as $name) {
+        foreach ($iterator as $name) {
             $names[] = $name;
         }
 

tests/05_Reading/PropertyReadMethodsTest.php

@@ -55,7 +55,7 @@ public function setUp()
     }
 
     /*** item base methods for property ***/
-    function testGetAncestor()
+    public function testGetAncestor()
     {
         $ancestor = $this->dateProperty->getAncestor(0);
         $this->assertNotNull($ancestor);
@@ -73,7 +73,7 @@ function testGetAncestor()
         $this->assertInstanceOf('PHPCR\PropertyInterface', $ancestor);
         $this->assertTrue($this->dateProperty->isSame($ancestor));
     }
-    function testGetDepthProperty()
+    public function testGetDepthProperty()
     {
         $this->assertEquals(2, $this->createdProperty->getDepth());
         $this->assertEquals(4, $this->dateProperty->getDepth());
@@ -115,7 +115,7 @@ public function testAccept()
         $this->createdProperty->accept($mock);
     }
 
-    function testGetPropertyName()
+    public function testGetPropertyName()
     {
         $name = $this->createdProperty->getName();
         $this->assertEquals('jcr:created', $name);
@@ -452,7 +452,6 @@ public function testGetLength()
         $this->assertEquals(29, $this->dateProperty->getLength());
     }
 
-
     //binary length is tested in BinaryReadMethodsTest
 
     // testGetLengthUnsuccessfull (return -1 on getLength) "should never happen" so no test

tests/05_Reading/SessionReadMethodsTest.php

@@ -179,7 +179,6 @@ public function testGetPropertiesInvalidArgument()
         $this->sharedFixture['session']->getProperties('no iterable thing');
     }
 
-
     /**
      * it is forbidden to call getItem on the session with a relative path
      * @expectedException \PHPCR\PathNotFoundException
@@ -227,7 +226,6 @@ public function testItemExistsInvalidPath()
         $this->sharedFixture['session']->itemExists('//');
     }
 
-
     public function testNodeExists()
     {
         $this->assertTrue($this->sharedFixture['session']->nodeExists('/'));

tests/06_Query/CharacterTest.php

@@ -6,7 +6,6 @@
 
 require_once(__DIR__ . '/../../inc/BaseCase.php');
 
-
 class CharacterTest extends \PHPCR\Test\BaseCase
 {
     public static function setupBeforeClass($fixtures = '06_Query/characters')
@@ -113,4 +112,4 @@ public function testQueryWithColon()
             QueryInterface::JCR_SQL2
         )->execute();
     }
-}
+}

tests/06_Query/NodeViewTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace PHPCR\Tests\Query;
 
-require_once('QueryBaseCase.php');
+require_once 'QueryBaseCase.php';
 
 /**
  * test the query result node view $ 6.11.2

tests/06_Query/QOM/ConvertQueriesBackAndForthTest.php

@@ -2,8 +2,8 @@
 namespace PHPCR\Tests\Query\QOM;
 
 require_once(__DIR__ . '/../../../inc/BaseCase.php');
-require_once('Sql2TestQueries.php');
-require_once('QomTestQueries.php');
+require_once 'Sql2TestQueries.php';
+require_once 'QomTestQueries.php';
 
 use PHPCR\Util\QOM\Sql2Generator;
 use PHPCR\Util\QOM\Sql2ToQomQueryConverter;
@@ -43,7 +43,7 @@ public function setUp()
 
         try {
             $this->sql2Parser = new Sql2ToQomQueryConverter($factory);
-        } catch(\PHPCR\UnsupportedRepositoryOperationException $e) {
+        } catch (\PHPCR\UnsupportedRepositoryOperationException $e) {
             $this->markTestSkipped('Repository does not support the QOM factory');
         }
     }