Allow installation with symfony 6, drop PHP 7.4 support and test against PHP 8.1 (#210)

alexander-schranz · web-flow · commit ecf25e69a544 · 2022-05-02T15:34:42.000+02:00
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -14,45 +14,34 @@ jobs:
         env:
             SYMFONY_DEPRECATIONS_HELPER: ${{ matrix.symfony-deprecation-helper }}
             BEHAT_SUITE: ${{ matrix.behat-suite }}
+            COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
         strategy:
             fail-fast: false
 
             matrix:
                 include:
-                    - php-version: '7.2'
+                    - php-version: '8.0'
                       dependencies: lowest
                       behat-suite: standalone
 
-                    - php-version: '7.2'
+                    - php-version: '8.0'
                       dependencies: lowest
                       behat-suite: embedded
 
-                    - php-version: '7.2'
+                    - php-version: '8.0'
                       dependencies: lowest
                       behat-suite: cli
 
-                    - php-version: '7.4'
+                    - php-version: '8.1'
                       dependencies: highest
                       behat-suite: standalone
 
-                    - php-version: '7.4'
+                    - php-version: '8.1'
                       dependencies: highest
                       behat-suite: embedded
 
-                    - php-version: '7.4'
-                      dependencies: highest
-                      behat-suite: cli
-
-                    - php-version: '8.0'
-                      dependencies: highest
-                      behat-suite: standalone
-
-                    - php-version: '8.0'
-                      dependencies: highest
-                      behat-suite: embedded
-
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       behat-suite: cli
 
@@ -67,17 +56,17 @@ jobs:
                   tools: 'composer:v2'
 
             - name: Install dependencies with Composer
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: ${{ matrix.dependencies }}
                   composer-options: ${{ matrix.composer-options }}
 
             - name: Start Jackrabbit
               run: |
-                  tests/bin/travis_jackrabbit.sh
+                  JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh
 
             - name: Execute test cases
               run: |
                   vendor/bin/phpunit
                   vendor/bin/phpspec run
-                  vendor/behat/behat/bin/behat --suite=${{ matrix.behat-suite }}
+                  vendor/bin/behat --suite=${{ matrix.behat-suite }}
diff --git a/composer.json b/composer.json
@@ -2,25 +2,25 @@
     "name": "phpcr/phpcr-shell",
     "description": "Shell for PHPCR",
     "require": {
-        "php": "^7.2 || ^8.0",
-        "symfony/console": "^5.0",
+        "php": "^8.0",
+        "symfony/console": "^5.0 || ^6.0",
         "jackalope/jackalope": "^1.3.4",
         "phpcr/phpcr": "^2.1",
         "phpcr/phpcr-utils": "^1.2",
-        "symfony/finder": "^5.0",
-        "symfony/serializer": "^5.0",
-        "symfony/yaml": "^5.0",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/expression-language": "^5.0",
+        "symfony/finder": "^5.0 || ^6.0",
+        "symfony/serializer": "^5.0 || ^6.0",
+        "symfony/yaml": "^5.0 || ^6.0",
+        "symfony/dependency-injection": "^5.0 || ^6.0",
+        "symfony/expression-language": "^5.0 || ^6.0",
         "dantleech/glob-finder": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
-        "symfony/symfony": "^5.0",
-        "behat/behat": "^3.6",
-        "phpspec/phpspec": "^6.0",
+        "phpunit/phpunit": "^9.5",
+        "behat/behat": "^3.10",
+        "phpspec/phpspec": "^7.2",
         "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "jackalope/jackalope-jackrabbit": "^1.3"
+        "jackalope/jackalope-jackrabbit": "^1.4.4",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "suggest": {
         "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal",
diff --git a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php
@@ -33,8 +33,12 @@ public function it_is_initializable()
         $this->shouldHaveType('PHPCR\Shell\Config\ProfileLoader');
     }
 
-    public function it_should_list_profile_names()
-    {
+    public function it_should_list_profile_names(
+        Filesystem $filesystem
+    ) {
+        $filesystem->exists(Argument::any())
+            ->willReturn(true);
+
         $this->getProfileNames()->shouldReturn([
             'one', 'two',
         ]);
diff --git a/src/PHPCR/Shell/Config/Config.php b/src/PHPCR/Shell/Config/Config.php
@@ -24,24 +24,29 @@ public function __construct($data)
         $this->data = $data;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         throw new \InvalidArgumentException(sprintf(
             'Setting values not permitted on configuration objects (trying to set "%s" to "%s"',
-            $offset, $value
+            $offset,
+            $value
         ));
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->data[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->data[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (isset($this->data[$offset])) {
@@ -55,26 +60,31 @@ public function offsetGet($offset)
         }
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         return next($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         return reset($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return current($this->data);
diff --git a/src/PHPCR/Shell/Console/Application/SessionApplication.php b/src/PHPCR/Shell/Console/Application/SessionApplication.php
@@ -45,7 +45,7 @@ public function __construct()
         $this->add($command);
     }
 
-    public function getDefaultInputDefinition()
+    public function getDefaultInputDefinition(): InputDefinition
     {
         return new InputDefinition([]);
     }
@@ -56,7 +56,7 @@ public function getDefaultInputDefinition()
      *
      * {@inheritdoc}
      */
-    protected function getCommandName(InputInterface $input)
+    protected function getCommandName(InputInterface $input): string
     {
         return 'phpcr_shell';
     }
diff --git a/src/PHPCR/Shell/Console/Helper/Table.php b/src/PHPCR/Shell/Console/Helper/Table.php
@@ -18,10 +18,11 @@ class Table extends OriginalTable
 {
     private $nbRows = 0;
 
-    public function addRow($row)
+    public function addRow($row): static
     {
         $this->nbRows++;
-        parent::addRow($row);
+
+        return parent::addRow($row);
     }
 
     public function getNumberOfRows()
diff --git a/src/PHPCR/Shell/Serializer/YamlEncoder.php b/src/PHPCR/Shell/Serializer/YamlEncoder.php
@@ -28,7 +28,7 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
      *
      * {@inheritdoc}
      */
-    public function encode($data, $format, array $context = [])
+    public function encode($data, $format, array $context = []): string
     {
         return Yaml::dump($data);
     }
@@ -43,15 +43,15 @@ public function decode($data, $format, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsEncoding($format)
+    public function supportsEncoding($format): bool
     {
         return 'yaml' === $format;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function supportsDecoding($format)
+    public function supportsDecoding($format): bool
     {
         return 'yaml' === $format;
     }
diff --git a/src/PHPCR/Shell/Test/ContextBase.php b/src/PHPCR/Shell/Test/ContextBase.php
@@ -113,7 +113,7 @@ private function getXPathForFile($filename)
     {
         $dom = new \DOMDocument(1.0);
         $dom->load($this->getWorkingFilePath($filename));
-        $xpath = new \DOMXpath($dom);
+        $xpath = new \DOMXPath($dom);
 
         return $xpath;
     }
@@ -209,7 +209,7 @@ public function iShouldSeeATableContainingTheFollowingRows(TableNode $table)
     public function iShouldSeeTheFollowing(PyStringNode $string)
     {
         $output = $this->getOutput();
-        Assert::assertContains($string->getRaw(), $output);
+        Assert::assertStringContainsString($string->getRaw(), $output);
     }
 
     /**
@@ -218,7 +218,7 @@ public function iShouldSeeTheFollowing(PyStringNode $string)
     public function iShouldNotSeeTheFollowing(PyStringNode $string)
     {
         $output = $this->getOutput();
-        Assert::assertNotContains($string->getRaw(), $output);
+        Assert::assertStringNotContainsString($string->getRaw(), $output);
     }
 
     /**
@@ -305,7 +305,7 @@ public function theFileExists($arg1)
     public function theOutputShouldContain(PyStringNode $string)
     {
         foreach ($string->getStrings() as $line) {
-            Assert::assertContains($line, $this->getOutput());
+            Assert::assertStringContainsString($line, $this->getOutput());
         }
     }
 
@@ -774,7 +774,8 @@ public function thePropertyShouldHaveType($arg1, $arg2)
         $property = $session->getItem($arg1);
         if (!$property instanceof PropertyInterface) {
             throw new \InvalidArgumentException(sprintf(
-                'Item at "%s" is not a property', $arg1
+                'Item at "%s" is not a property',
+                $arg1
             ));
         }
 
@@ -790,7 +791,8 @@ public function thePropertyShouldHaveTypeAndValue($arg1, $arg2, $arg3)
         $property = $session->getItem($arg1);
         if (!$property instanceof PropertyInterface) {
             throw new \InvalidArgumentException(sprintf(
-                'Item at "%s" is not a property', $arg1
+                'Item at "%s" is not a property',
+                $arg1
             ));
         }
 
diff --git a/tests/PHPCR/Shell/Helper/NodeHelperTest.php b/tests/PHPCR/Shell/Helper/NodeHelperTest.php
@@ -14,9 +14,12 @@
 
 use PHPCR\NodeInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class NodeHelperTest extends TestCase
 {
+    use ProphecyTrait;
+
     protected $nodeHelper;
 
     public function setUp(): void
diff --git a/tests/PHPCR/Shell/Phpcr/PhpcrSessionTest.php b/tests/PHPCR/Shell/Phpcr/PhpcrSessionTest.php
@@ -14,9 +14,12 @@
 
 use PHPCR\PathNotFoundException;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class PhpcrSessionTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function setUp(): void
     {
         $this->phpcr = $this->prophesize('PHPCR\SessionInterface');

Original file line number	Diff line number	Diff line change
`@@ -24,24 +24,29 @@ public function __construct($data)`
`24`	`24`	`$this->data = $data;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ #[\ReturnTypeWillChange]`
`27`	`28`	`public function offsetSet($offset, $value)`
`28`	`29`	`{`
`29`	`30`	`throw new \InvalidArgumentException(sprintf(`
`30`	`31`	`'Setting values not permitted on configuration objects (trying to set "%s" to "%s"',`
`31`		`- $offset, $value`
	`32`	`+ $offset,`
	`33`	`+ $value`
`32`	`34`	`));`
`33`	`35`	`}`
`34`	`36`
	`37`	`+ #[\ReturnTypeWillChange]`
`35`	`38`	`public function offsetExists($offset)`
`36`	`39`	`{`
`37`	`40`	`return isset($this->data[$offset]);`
`38`	`41`	`}`
`39`	`42`
	`43`	`+ #[\ReturnTypeWillChange]`
`40`	`44`	`public function offsetUnset($offset)`
`41`	`45`	`{`
`42`	`46`	`unset($this->data[$offset]);`
`43`	`47`	`}`
`44`	`48`
	`49`	`+ #[\ReturnTypeWillChange]`
`45`	`50`	`public function offsetGet($offset)`
`46`	`51`	`{`
`47`	`52`	`if (isset($this->data[$offset])) {`
`@@ -55,26 +60,31 @@ public function offsetGet($offset)`
`55`	`60`	`}`
`56`	`61`	`}`
`57`	`62`
	`63`	`+ #[\ReturnTypeWillChange]`
`58`	`64`	`public function current()`
`59`	`65`	`{`
`60`	`66`	`return current($this->data);`
`61`	`67`	`}`
`62`	`68`
	`69`	`+ #[\ReturnTypeWillChange]`
`63`	`70`	`public function key()`
`64`	`71`	`{`
`65`	`72`	`return key($this->data);`
`66`	`73`	`}`
`67`	`74`
	`75`	`+ #[\ReturnTypeWillChange]`
`68`	`76`	`public function next()`
`69`	`77`	`{`
`70`	`78`	`return next($this->data);`
`71`	`79`	`}`
`72`	`80`
	`81`	`+ #[\ReturnTypeWillChange]`
`73`	`82`	`public function rewind()`
`74`	`83`	`{`
`75`	`84`	`return reset($this->data);`
`76`	`85`	`}`
`77`	`86`
	`87`	`+ #[\ReturnTypeWillChange]`
`78`	`88`	`public function valid()`
`79`	`89`	`{`
`80`	`90`	`return current($this->data);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct()`
`45`	`45`	`$this->add($command);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function getDefaultInputDefinition()`
	`48`	`+ public function getDefaultInputDefinition(): InputDefinition`
`49`	`49`	`{`
`50`	`50`	`return new InputDefinition([]);`
`51`	`51`	`}`
`@@ -56,7 +56,7 @@ public function getDefaultInputDefinition()`
`56`	`56`	`*`
`57`	`57`	`* {@inheritdoc}`
`58`	`58`	`*/`
`59`		`- protected function getCommandName(InputInterface $input)`
	`59`	`+ protected function getCommandName(InputInterface $input): string`
`60`	`60`	`{`
`61`	`61`	`return 'phpcr_shell';`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,11 @@ class Table extends OriginalTable`
`18`	`18`	`{`
`19`	`19`	`private $nbRows = 0;`
`20`	`20`
`21`		`- public function addRow($row)`
	`21`	`+ public function addRow($row): static`
`22`	`22`	`{`
`23`	`23`	`$this->nbRows++;`
`24`		`- parent::addRow($row);`
	`24`	`+`
	`25`	`+ return parent::addRow($row);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public function getNumberOfRows()`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class YamlEncoder implements EncoderInterface, DecoderInterface`
`28`	`28`	`*`
`29`	`29`	`* {@inheritdoc}`
`30`	`30`	`*/`
`31`		`- public function encode($data, $format, array $context = [])`
	`31`	`+ public function encode($data, $format, array $context = []): string`
`32`	`32`	`{`
`33`	`33`	`return Yaml::dump($data);`
`34`	`34`	`}`
`@@ -43,15 +43,15 @@ public function decode($data, $format, array $context = [])`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function supportsEncoding($format)`
	`46`	`+ public function supportsEncoding($format): bool`
`47`	`47`	`{`
`48`	`48`	`return 'yaml' === $format;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`	`52`	`* {@inheritdoc}`
`53`	`53`	`*/`
`54`		`- public function supportsDecoding($format)`
	`54`	`+ public function supportsDecoding($format): bool`
`55`	`55`	`{`
`56`	`56`	`return 'yaml' === $format;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private function getXPathForFile($filename)`
`113`	`113`	`{`
`114`	`114`	`$dom = new \DOMDocument(1.0);`
`115`	`115`	`$dom->load($this->getWorkingFilePath($filename));`
`116`		`- $xpath = new \DOMXpath($dom);`
	`116`	`+ $xpath = new \DOMXPath($dom);`
`117`	`117`
`118`	`118`	`return $xpath;`
`119`	`119`	`}`
`@@ -209,7 +209,7 @@ public function iShouldSeeATableContainingTheFollowingRows(TableNode $table)`
`209`	`209`	`public function iShouldSeeTheFollowing(PyStringNode $string)`
`210`	`210`	`{`
`211`	`211`	`$output = $this->getOutput();`
`212`		`- Assert::assertContains($string->getRaw(), $output);`
	`212`	`+ Assert::assertStringContainsString($string->getRaw(), $output);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`/**`
`@@ -218,7 +218,7 @@ public function iShouldSeeTheFollowing(PyStringNode $string)`
`218`	`218`	`public function iShouldNotSeeTheFollowing(PyStringNode $string)`
`219`	`219`	`{`
`220`	`220`	`$output = $this->getOutput();`
`221`		`- Assert::assertNotContains($string->getRaw(), $output);`
	`221`	`+ Assert::assertStringNotContainsString($string->getRaw(), $output);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`/**`
`@@ -305,7 +305,7 @@ public function theFileExists($arg1)`
`305`	`305`	`public function theOutputShouldContain(PyStringNode $string)`
`306`	`306`	`{`
`307`	`307`	`foreach ($string->getStrings() as $line) {`
`308`		`- Assert::assertContains($line, $this->getOutput());`
	`308`	`+ Assert::assertStringContainsString($line, $this->getOutput());`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`@@ -774,7 +774,8 @@ public function thePropertyShouldHaveType($arg1, $arg2)`
`774`	`774`	`$property = $session->getItem($arg1);`
`775`	`775`	`if (!$property instanceof PropertyInterface) {`
`776`	`776`	`throw new \InvalidArgumentException(sprintf(`
`777`		`- 'Item at "%s" is not a property', $arg1`
	`777`	`+ 'Item at "%s" is not a property',`
	`778`	`+ $arg1`
`778`	`779`	`));`
`779`	`780`	`}`
`780`	`781`
`@@ -790,7 +791,8 @@ public function thePropertyShouldHaveTypeAndValue($arg1, $arg2, $arg3)`
`790`	`791`	`$property = $session->getItem($arg1);`
`791`	`792`	`if (!$property instanceof PropertyInterface) {`
`792`	`793`	`throw new \InvalidArgumentException(sprintf(`
`793`		`- 'Item at "%s" is not a property', $arg1`
	`794`	`+ 'Item at "%s" is not a property',`
	`795`	`+ $arg1`
`794`	`796`	`));`
`795`	`797`	`}`
`796`	`798`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,12 @@`
`14`	`14`
`15`	`15`	`use PHPCR\PathNotFoundException;`
`16`	`16`	`use PHPUnit\Framework\TestCase;`
	`17`	`+use Prophecy\PhpUnit\ProphecyTrait;`
`17`	`18`
`18`	`19`	`class PhpcrSessionTest extends TestCase`
`19`	`20`	`{`
	`21`	`+ use ProphecyTrait;`
	`22`	`+`
`20`	`23`	`public function setUp(): void`
`21`	`24`	`{`
`22`	`25`	`$this->phpcr = $this->prophesize('PHPCR\SessionInterface');`