increased min PHP version to 5.6 and updated phpunit tests

Author: pavelvondrasek

.styleci.yml

@@ -1,5 +1,5 @@
 preset: psr2
 
 enabled:
-  - long_array_syntax
+  - short_array_syntax
   - duplicate_semicolon

composer.json

@@ -27,8 +27,9 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "phpcr/phpcr-implementation": "2.1.*"
+        "php": "^5.6|7.0.x",
+        "phpcr/phpcr-implementation": "2.1.*",
+        "phpunit/phpunit": "^5.7"
     },
     "autoload": {
         "psr-4": {

inc/AbstractLoader.php

@@ -11,8 +11,13 @@
 
 namespace PHPCR\Test;
 
+use Exception;
+use PHPCR\CredentialsInterface;
 use PHPCR\NoSuchWorkspaceException;
 use PHPCR\RepositoryFactoryInterface;
+use PHPCR\RepositoryInterface;
+use PHPCR\SessionInterface;
+use PHPUnit_Framework_SkippedTestSuiteError;
 
 /**
  * Base class for the bootstrapping to load your phpcr implementation for the
@@ -22,22 +27,35 @@
  */
 abstract class AbstractLoader
 {
+    /**
+     * @var string
+     */
     protected $factoryclass;
+
+    /**
+     * @var string
+     */
     protected $workspacename;
+
+    /**
+     * @var string
+     */
     protected $otherWorkspacename;
 
     /**
      * array with chapter names to skip all test cases in (without the numbers).
      */
-    protected $unsupportedChapters = array();
+    protected $unsupportedChapters = [];
+
     /**
      * array in the format Chapter\FeatureTest with all cases to skip.
      */
-    protected $unsupportedCases = array();
+    protected $unsupportedCases = [];
+
     /**
      * array in the format Chapter\FeatureTest::testName with all single tests to skip.
      */
-    protected $unsupportedTests = array();
+    protected $unsupportedTests = [];
 
     /**
      * Create the loader.
@@ -63,10 +81,12 @@ protected function __construct($factoryclass, $workspacename = 'tests', $otherWo
      * configured to provide things from your implementation.
      *
      * @return AbstractLoader loader for your implementation
+     *
+     * @throws Exception
      */
     public static function getInstance()
     {
-        throw new \Exception('You need to overwrite this method, but php does not allow to declare it abstract.');
+        throw new Exception('You need to overwrite this method, but php does not allow to declare it abstract.');
     }
 
     /**
@@ -89,26 +109,28 @@ abstract public function getRepositoryFactoryParameters();
      * The default implementation uses the factory, but if the factory has an
      * error, you will get failing tests all over.
      *
-     * @return \PHPCR\RepositoryInterface the repository instance
+     * @return 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");
+            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 CredentialsInterface the login credentials that lead to successful login into the repository
      */
     abstract public function getCredentials();
 
     /**
-     * @return \PHPCR\CredentialsInterface the login credentials that lead to login failure
+     * @return CredentialsInterface the login credentials that lead to login failure
      */
     abstract public function getInvalidCredentials();
 
@@ -118,7 +140,7 @@ abstract public 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 CredentialsInterface the login credentials with limited permissions for testing impersonate and access control
      */
     abstract public function getRestrictedCredentials();
 
@@ -165,9 +187,9 @@ public function getOtherWorkspaceName()
     /**
      * Get a session for this implementation.
      *
-     * @param \PHPCR\CredentialsInterface $credentials The credentials to log into the repository. If omitted, self::getCredentials should be used
+     * @param 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 SessionInterface the session resulting from logging into the repository with the provided credentials
      */
     public function getSession($credentials = false)
     {
@@ -177,9 +199,9 @@ public function getSession($credentials = false)
     /**
      * Get a session corresponding to the additional workspace for this implementation.
      *
-     * @param \PHPCR\CredentialsInterface $credentials The credentials to log into the repository. If omitted, self::getCredentials should be used
+     * @param 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 SessionInterface the session resulting from logging into the repository with the provided credentials
      */
     public function getAdditionalSession($credentials = false)
     {
@@ -192,9 +214,9 @@ public function getAdditionalSession($credentials = false)
      *
      * Otherwise, the test regarding this feature is skipped.
      *
-     * @return \PHPCR\SessionInterface
+     * @return SessionInterface
      *
-     * @throws \PHPUnit_Framework_SkippedTestSuiteError to make whole test
+     * @throws PHPUnit_Framework_SkippedTestSuiteError to make whole test
      *      suite skip if implementation does not support updating the
      *      properties automatically.
      */
@@ -204,7 +226,7 @@ public function getSessionWithLastModified()
             return $this->getSession();
         }
 
-        throw new \PHPUnit_Framework_SkippedTestSuiteError('Not supported');
+        throw new PHPUnit_Framework_SkippedTestSuiteError('Not supported');
     }
 
     /**
@@ -240,7 +262,7 @@ public function getTestSupported($chapter, $case, $name)
     }
 
     /**
-     * @return \PHPCR\Test\FixtureLoaderInterface implementation that is used to load test fixtures
+     * @return FixtureLoaderInterface implementation that is used to load test fixtures
      */
     abstract public function getFixtureLoader();
 
@@ -249,6 +271,8 @@ abstract public function getFixtureLoader();
      * @param $workspaceName
      *
      * @return mixed
+     *
+     * @throws Exception
      */
     private function getSessionForWorkspace($credentials, $workspaceName)
     {
@@ -263,8 +287,9 @@ private function getSessionForWorkspace($credentials, $workspaceName)
             $adminRepository = $this->getRepository(); // get a new repository to log into
             $session = $adminRepository->login($this->getCredentials(), 'default');
             $workspace = $session->getWorkspace();
+
             if (in_array($workspaceName, $workspace->getAccessibleWorkspaceNames())) {
-                throw new \Exception(sprintf('Workspace "%s" already exists but could not login to it', $workspaceName), null, $e);
+                throw new Exception(sprintf('Workspace "%s" already exists but could not login to it', $workspaceName), null, $e);
             }
             $workspace->createWorkspace($workspaceName);
 

inc/BaseCase.php

@@ -11,19 +11,20 @@
 
 namespace PHPCR\Test;
 
+use ImplementationLoader;
+use Iterator;
+use IteratorAggregate;
+use PHPCR\RepositoryException;
 use PHPCR\SessionInterface;
 use PHPCR\NodeInterface;
 use DateTime;
-
-// PHPUnit 3.4 compat
-if (method_exists('PHPUnit_Util_Filter', 'addDirectoryToFilter')) {
-    require_once 'PHPUnit/Framework.php';
-}
+use PHPUnit_Framework_SkippedTestSuiteError;
+use PHPUnit_Framework_TestCase;
 
 /**
  * Base class for all phpcr api tests.
  */
-abstract class BaseCase extends \PHPUnit_Framework_TestCase
+abstract class BaseCase extends PHPUnit_Framework_TestCase
 {
     /**
      * Describes the path to the node for this test, used with writing tests.
@@ -40,14 +41,14 @@ abstract class BaseCase extends \PHPUnit_Framework_TestCase
     /**
      * The root node of the fixture, initialized for each test.
      *
-     * @var \PHPCR\NodeInterface
+     * @var NodeInterface
      */
     protected $rootNode = null;
 
     /**
      * The node in the current fixture at /test_class_name/testMethod.
      *
-     * @var \PHPCR\NodeInterface
+     * @var NodeInterface
      */
     protected $node = null;
 
@@ -75,7 +76,7 @@ abstract class BaseCase extends \PHPUnit_Framework_TestCase
     /**
      * Same as staticSharedFixture, loaded in setUp for your convenience.
      */
-    protected $sharedFixture = array();
+    protected $sharedFixture = [];
 
     /**
      * the loader can throw a PHPCR\RepositoryException
@@ -97,16 +98,16 @@ abstract class BaseCase extends \PHPUnit_Framework_TestCase
      */
     public static function setupBeforeClass($fixtures = 'general/base')
     {
-        self::$loader = \ImplementationLoader::getInstance();
+        self::$loader = ImplementationLoader::getInstance();
 
         $fqn = get_called_class();
         list($phpcr, $tests, $chapter, $case) = explode('\\', $fqn);
         $case = "$chapter\\$case";
         if (!self::$loader->getTestSupported($chapter, $case, null)) {
-            throw new \PHPUnit_Framework_SkippedTestSuiteError('Test case not supported by this implementation');
+            throw new PHPUnit_Framework_SkippedTestSuiteError('Test case not supported by this implementation');
         }
 
-        self::$staticSharedFixture = array();
+        self::$staticSharedFixture = [];
         date_default_timezone_set('Europe/Zurich'); //TODO put this here?
 
         self::$staticSharedFixture['ie'] = self::$loader->getFixtureLoader();
@@ -156,7 +157,7 @@ public static function tearDownAfterClass()
      *
      * Logout from the old session but does *NOT* save the session
      *
-     * @return \PHPCR\SessionInterface   The new session
+     * @return SessionInterface   The new session
      */
     protected function renewSession()
     {
@@ -176,7 +177,7 @@ protected function renewSession()
      *
      * Saves the old session and logs it out.
      *
-     * @return \PHPCR\SessionInterface   The new session
+     * @return SessionInterface   The new session
      */
     protected function saveAndRenewSession()
     {
@@ -217,28 +218,29 @@ protected function initProperties()
      * this is similar to doing self::$loader->getSession($credentials) but
      * does error handling and asserts the session is a valid SessionInterface
      *
-     * @return \PHPCR\SessionInterface the session from the login
+     * @return SessionInterface the session from the login
      */
     protected function assertSession($credentials = false)
     {
         try {
-            $ses = self::$loader->getSession($credentials);
-        } catch (\PHPCR\RepositoryException $e) {
-            if ($e->getMessage() == self::NOTSUPPORTEDLOGIN) {
+            $session = self::$loader->getSession($credentials);
+        } catch (RepositoryException $e) {
+            if ($e->getMessage() === self::NOTSUPPORTEDLOGIN) {
                 $this->markTestSkipped('This implementation does not support this type of login.');
             } else {
                 throw $e;
             }
         }
-        $this->assertInstanceOf('PHPCR\SessionInterface', $ses);
 
-        return $ses;
+        $this->assertInstanceOf(SessionInterface::class, $session);
+
+        return $session;
     }
 
     /** assert that this is an object that is traversable */
     protected function assertTraversableImplemented($obj)
     {
-        $this->assertTrue($obj instanceof \Iterator || $obj instanceof \IteratorAggregate, 'To provide Traversable, you have to either implement Iterator or IteratorAggregate');
+        $this->assertTrue($obj instanceof Iterator || $obj instanceof IteratorAggregate, 'To provide Traversable, you have to either implement Iterator or IteratorAggregate');
     }
 
     /**
@@ -269,13 +271,13 @@ protected function assertEqualDateTime(DateTime $date1, DateTime $date2)
      * other. Use this rather than plain "Equal" when checking application
      * generated dates.
      *
-     * @param \DateTime $expected
-     * @param \DateTime $data
+     * @param DateTime $expected
+     * @param DateTime $data
      */
     protected function assertSimilarDateTime($expected, $data)
     {
-        $this->assertInstanceOf('\DateTime', $expected);
-        $this->assertInstanceOf('\DateTime', $data);
+        $this->assertInstanceOf(DateTime::class, $expected);
+        $this->assertInstanceOf(DateTime::class, $data);
         $this->assertTrue(abs($expected->getTimestamp() - $data->getTimestamp()) <= 3,
             $data->format('c').' is not close to the expected '.$expected->format('c')
         );

tests/Connecting/RepositoryDescriptorsTest.php

@@ -11,16 +11,18 @@
 
 namespace PHPCR\Tests\Connecting;
 
-class RepositoryDescriptorsTest extends \PHPCR\Test\BaseCase
+use PHPCR\Test\BaseCase;
+
+class RepositoryDescriptorsTest extends BaseCase
 {
     public static function setupBeforeClass($fixtures = false)
     {
-        //don't care about fixtures
+        // Don't care about fixtures
         parent::setupBeforeClass($fixtures);
     }
 
-    //Those constants need to be defined in the bootstrap file
-    protected $expectedDescriptors = array(
+    // Those constants need to be defined in the bootstrap file
+    protected $expectedDescriptors = [
         SPEC_VERSION_DESC,
         SPEC_NAME_DESC,
         REP_VENDOR_DESC,
@@ -32,7 +34,7 @@ public static function setupBeforeClass($fixtures = false)
         OPTION_OBSERVATION_SUPPORTED,
         OPTION_LOCKING_SUPPORTED,
         // TODO: complete with the list from jcr 2
-    );
+    ];
 
     // 24.2 Repository Descriptors
     public function testDescriptorKeys()