php 8

Author: dbu

.styleci.yml

@@ -2,3 +2,5 @@ preset: recommended
 
 enabled:
   - no_useless_else
+disabled:
+  - align_double_arrow

.travis.yml

@@ -1,12 +1,11 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
   - 7.4
+  - nightly
 
 env:
   - PACKAGE_VERSION=high
@@ -15,7 +14,7 @@ sudo: false
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.1
       env: PACKAGE_VERSION=low
     - php: 7.4
       env:

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.5.0
+-----
+
+* Support PHP 8
+* Drop support for PHP 5.6 and 7.0
+
 1.4.1
 -----
 

composer.json

@@ -27,13 +27,13 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1 || ^8.0",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "^2.3|^3.0|^4.0|^5.0"
+        "symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "ramsey/uuid": "^3.5",
-        "phpunit/phpunit": "^5.7 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0"
     },
     "suggest": {
         "ramsey/uuid": "A library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."

tests/PHPCR/Tests/Util/CND/Reader/BufferReaderTest.php

@@ -7,15 +7,21 @@
 
 class BufferReaderTest extends TestCase
 {
-    public function test__construct()
+    public function test__construct(): void
     {
         $buffer = "Some random\nor\r\nstring";
         $reader = new BufferReader($buffer);
 
-        $this->assertInstanceOf(BufferReader::class, $reader);
-        $this->assertAttributeEquals(str_replace("\r\n", "\n", $buffer).$reader->getEofMarker(), 'buffer', $reader);
-        $this->assertAttributeEquals(0, 'startPos', $reader);
-        $this->assertAttributeEquals(0, 'forwardPos', $reader);
+        $reflection = new \ReflectionClass($reader);
+        $bufferProperty = $reflection->getProperty('buffer');
+        $bufferProperty->setAccessible(true);
+        $this->assertSame(str_replace("\r\n", "\n", $buffer).$reader->getEofMarker(), $bufferProperty->getValue($reader));
+        $startPos = $reflection->getProperty('startPos');
+        $startPos->setAccessible(true);
+        $this->assertSame(0, $startPos->getValue($reader));
+        $forwardPos = $reflection->getProperty('forwardPos');
+        $forwardPos->setAccessible(true);
+        $this->assertSame(0, $forwardPos->getValue($reader));
 
         $this->assertEquals(1, $reader->getCurrentLine());
         $this->assertEquals(1, $reader->getCurrentColumn());
@@ -90,10 +96,16 @@ public function test__constructEmptyString()
     {
         $reader = new BufferReader('');
 
-        $this->assertInstanceOf(BufferReader::class, $reader);
-        $this->assertAttributeEquals($reader->getEofMarker(), 'buffer', $reader);
-        $this->assertAttributeEquals(0, 'startPos', $reader);
-        $this->assertAttributeEquals(0, 'forwardPos', $reader);
+        $reflection = new \ReflectionClass($reader);
+        $buffer = $reflection->getProperty('buffer');
+        $buffer->setAccessible(true);
+        $this->assertSame($reader->getEofMarker(), $buffer->getValue($reader));
+        $startPos = $reflection->getProperty('startPos');
+        $startPos->setAccessible(true);
+        $this->assertSame(0, $startPos->getValue($reader));
+        $forwardPos = $reflection->getProperty('forwardPos');
+        $forwardPos->setAccessible(true);
+        $this->assertSame(0, $forwardPos->getValue($reader));
 
         $this->assertEquals(1, $reader->getCurrentLine());
         $this->assertEquals(1, $reader->getCurrentColumn());

tests/PHPCR/Tests/Util/CND/Reader/FileReaderTest.php

@@ -23,7 +23,7 @@ class FileReaderTest extends TestCase
      */
     private $lines;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->filepath = __DIR__.'/../Fixtures/files/TestFile.txt';
         $this->reader = new FileReader($this->filepath);

tests/PHPCR/Tests/Util/CND/Scanner/GenericScannerTest.php

@@ -108,7 +108,7 @@ class GenericScannerTest extends TestCase
 
     protected $expectedTokensNoEmptyToken;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->expectedTokensNoEmptyToken = [];
         foreach ($this->expectedTokens as $token) {

tests/PHPCR/Tests/Util/CND/Scanner/TokenQueueTest.php

@@ -33,7 +33,7 @@ class TokenQueueTest extends TestCase
      */
     private $queue;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->token0 = new Token(0, 'token 0');
         $this->token1 = new Token(1, 'token 1');
@@ -50,13 +50,16 @@ public function setUp()
     public function testAdd()
     {
         $queue = new TokenQueue();
-        $this->assertAttributeEquals([], 'tokens', $queue);
+        $reflection = new \ReflectionClass($queue);
+        $tokens = $reflection->getProperty('tokens');
+        $tokens->setAccessible(true);
+        $this->assertSame([], $tokens->getValue($queue));
 
         $queue->add($this->token0);
-        $this->assertAttributeEquals([$this->token0], 'tokens', $queue);
+        $this->assertSame([$this->token0], $tokens->getValue($queue));
 
         $queue->add($this->token1);
-        $this->assertAttributeEquals([$this->token0, $this->token1], 'tokens', $queue);
+        $this->assertSame([$this->token0, $this->token1], $tokens->getValue($queue));
     }
 
     public function testResetAndPeek()

tests/PHPCR/Tests/Util/CND/Scanner/TokenTest.php

@@ -12,15 +12,15 @@ class TokenTest extends TestCase
      */
     private $token;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->token = new Token(123, 'foobar');
     }
 
     public function test__construct()
     {
-        $this->assertAttributeEquals(123, 'type', $this->token);
-        $this->assertAttributeEquals('foobar', 'data', $this->token);
+        $this->assertSame(123, $this->token->type);
+        $this->assertSame('foobar', $this->token->data);
     }
 
     public function testGetData()

tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

@@ -69,7 +69,7 @@ abstract class BaseCommandTest extends TestCase
      */
     public $application;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->session = $this->createMock(SessionInterface::class);
         $this->workspace = $this->createMock(WorkspaceInterface::class);
@@ -88,21 +88,21 @@ public function setUp()
             'phpcr_console_dumper' => $this->dumperHelper,
         ]);
 
-        $this->session->expects($this->any())
+        $this->session
             ->method('getWorkspace')
-            ->will($this->returnValue($this->workspace));
+            ->willReturn($this->workspace);
 
-        $this->workspace->expects($this->any())
+        $this->workspace
             ->method('getName')
-            ->will($this->returnValue('test'));
+            ->willReturn('test');
 
-        $this->workspace->expects($this->any())
+        $this->workspace
             ->method('getQueryManager')
-            ->will($this->returnValue($this->queryManager));
+            ->willReturn($this->queryManager);
 
-        $this->queryManager->expects($this->any())
+        $this->queryManager
             ->method('getSupportedQueryLanguages')
-            ->will($this->returnValue(['JCR-SQL2']));
+            ->willReturn(['JCR-SQL2']);
 
         $this->application = new Application();
         $this->application->setHelperSet($this->helperSet);