fixing annotations and whitespace in tests

Author: dbu

inc/AbstractLoader.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace PHPCR\Test;
 
+use PHPCR\RepositoryFactoryInterface;
+
 /**
  * Base class for the bootstrapping to load your phpcr implementation for the
  * test suite.
@@ -72,22 +75,26 @@ public abstract function getRepositoryFactoryParameters();
      * The default implementation uses the factory, but if the factory has an
      * error, you will get failing tests all over.
      *
-     * @return PHPCR\RepositoryInstance the repository instance
+     * @return \PHPCR\RepositoryInterface the repository instance
      */
     public function getRepository()
     {
         $factoryclass = $this->getRepositoryFactoryClass();
         $factory = new $factoryclass;
+        if (! $factory instanceof RepositoryFactoryInterface) {
+            throw new \Exception("$factoryclass is not of type RepositoryFactoryInterface");
+        }
+        /** @var $factory RepositoryFactoryInterface */
         return $factory->getRepository($this->getRepositoryFactoryParameters());
     }
 
     /**
-     * @return PHPCR\CredentialsInterface the login credentials that lead to successful login into the repository
+     * @return \PHPCR\CredentialsInterface the login credentials that lead to successful login into the repository
      */
     public abstract function getCredentials();
 
     /**
-     * @return PHPCR\CredentialsInterface the login credentials that lead to login failure
+     * @return \PHPCR\CredentialsInterface the login credentials that lead to login failure
      */
     public abstract function getInvalidCredentials();
 
@@ -97,7 +104,7 @@ public abstract function getInvalidCredentials();
      *
      * The user may not have write access to /tests_general_base/numberPropertyNode/jcr:content/foo
      *
-     * @return PHPCR\CredentialsInterface the login credentials with limited permissions for testing impersonate and access control
+     * @return \PHPCR\CredentialsInterface the login credentials with limited permissions for testing impersonate and access control
      */
     public abstract function getRestrictedCredentials();
 
@@ -118,7 +125,7 @@ public function getWorkspaceName()
      * Get a session for this implementation.
      *
      * @param \PHPCR\CredentialsInterface $credentials The credentials to log into the repository. If omitted, self::getCredentials should be used
-     * @return PHPCR\SessionInterface the session resulting from logging into the repository with the provided credentials
+     * @return \PHPCR\SessionInterface the session resulting from logging into the repository with the provided credentials
      */
     public function getSession($credentials = false)
     {
@@ -151,7 +158,7 @@ public function getTestSupported($chapter, $case, $name)
     }
 
     /**
-     * @return PHPCR\Test\FixtureLoaderInterface implementation that is used to load test fixtures
+     * @return \PHPCR\Test\FixtureLoaderInterface implementation that is used to load test fixtures
      */
     public abstract function getFixtureLoader();
 

tests/23_OrderableChildNodes/OrderBeforeTest.php

@@ -212,6 +212,7 @@ public function testNodeOrderBeforeUpAndDelete()
      */
     public function testNodeOrderBeforeUpAndRefresh()
     {
+        /** @var $session \PHPCR\SessionInterface */
         $session = $this->sharedFixture['session'];
         $this->assertInstanceOf('\PHPCR\NodeInterface', $this->node);
         $path = $this->node->getPath();
@@ -389,6 +390,7 @@ public function testNodeOrderNamespaces()
      */
     public function testNodeOrderAfterOrderAndMove()
     {
+        /** @var $session \PHPCR\SessionInterface */
         $session = $this->sharedFixture['session'];
         $this->assertInstanceOf('\PHPCR\NodeInterface', $this->node);
 
@@ -400,15 +402,15 @@ public function testNodeOrderAfterOrderAndMove()
 
         $srcParentNode->orderBefore('three', 'two');
         $dstParentNode->orderBefore('three', 'two');
-        
+
         $session->move($src . '/three', $dst . '/moved-three');
-        $dstNode = $session->getNode($dst . '/moved-three');        
+        $dstNode = $session->getNode($dst . '/moved-three');
         $this->assertInstanceOf('PHPCR\NodeInterface', $dstNode);
-        
-        $dstParentNode = $session->getNode($dst);        
+
+        $dstParentNode = $session->getNode($dst);
         $this->assertChildOrder(array('one', 'three', 'two', 'four', 'moved-three'), $dstParentNode);
 
-        $srcParentNode = $session->getNode($src);        
+        $srcParentNode = $session->getNode($src);
         $this->assertChildOrder(array('one', 'two', 'four'), $srcParentNode);
 
         $session->save();
@@ -418,10 +420,10 @@ public function testNodeOrderAfterOrderAndMove()
         $dstNode = $session->getNode($dst . '/moved-three');
         $this->assertInstanceOf('PHPCR\NodeInterface', $dstNode);
 
-        $dstParentNode = $session->getNode($dst);        
+        $dstParentNode = $session->getNode($dst);
         $this->assertChildOrder(array('one', 'three', 'two', 'four', 'moved-three'), $dstParentNode);
 
-        $srcParentNode = $session->getNode($src);        
+        $srcParentNode = $session->getNode($src);
         $this->assertChildOrder(array('one', 'two', 'four'), $srcParentNode);
     }
 }