From b2f4a14711b4fa830c2c260326a4433ca6c7aee9 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 16:57:36 +0200 Subject: [PATCH 01/21] Allow installation with symfony 6 --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 2030e4f..b25061e 100644 --- a/composer.json +++ b/composer.json @@ -3,20 +3,20 @@ "description": "Shell for PHPCR", "require": { "php": "^7.2 || ^8.0", - "symfony/console": "^5.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", + "symfony/symfony": "^5.0 || ^6.0", "behat/behat": "^3.6", "phpspec/phpspec": "^6.0", "jackalope/jackalope-doctrine-dbal": "^1.3", From a2a72af2f68c0dfccba2c33e4293a155024ec8a3 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 16:58:51 +0200 Subject: [PATCH 02/21] Add ci test against php 8.1 --- .github/workflows/test-application.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index bbd0039..000cb01 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -56,6 +56,18 @@ jobs: dependencies: highest behat-suite: cli + - php-version: '8.1' + dependencies: highest + behat-suite: standalone + + - php-version: '8.1' + dependencies: highest + behat-suite: embedded + + - php-version: '8.1' + dependencies: highest + behat-suite: cli + steps: - name: Checkout project uses: actions/checkout@v2 From 9b2c3d696092dce4e0c58e4b239bf765dd7aff85 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:00:01 +0200 Subject: [PATCH 03/21] Remove symfony/symfony from dev dependencies --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index b25061e..092d8b8 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ }, "require-dev": { "phpunit/phpunit": "^8.5", - "symfony/symfony": "^5.0 || ^6.0", "behat/behat": "^3.6", "phpspec/phpspec": "^6.0", "jackalope/jackalope-doctrine-dbal": "^1.3", From 2c8ef1d2da300f82e67e62d05ccce0485ee730bc Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:01:27 +0200 Subject: [PATCH 04/21] Upgrade dev dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 092d8b8..36a64b3 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ "dantleech/glob-finder": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5 || ^9.5", "behat/behat": "^3.6", - "phpspec/phpspec": "^6.0", + "phpspec/phpspec": "^6.0 || ^7.0", "jackalope/jackalope-doctrine-dbal": "^1.3", "jackalope/jackalope-jackrabbit": "^1.3" }, From 2e66132068c89138cdc65c7e2d984175124872e2 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:04:48 +0200 Subject: [PATCH 05/21] Upgrade YamlEncoder for Symfony 6 compatibility --- src/PHPCR/Shell/Serializer/YamlEncoder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PHPCR/Shell/Serializer/YamlEncoder.php b/src/PHPCR/Shell/Serializer/YamlEncoder.php index 2665978..e63667d 100644 --- 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,7 +43,7 @@ public function decode($data, $format, array $context = []) /** * {@inheritdoc} */ - public function supportsEncoding($format) + public function supportsEncoding($format): bool { return 'yaml' === $format; } @@ -51,7 +51,7 @@ public function supportsEncoding($format) /** * {@inheritdoc} */ - public function supportsDecoding($format) + public function supportsDecoding($format): bool { return 'yaml' === $format; } From 4691615fcffbb4017e18339d48ff8e0131fe5819 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:11:55 +0200 Subject: [PATCH 06/21] Add PHP 8.1 compatibility to Config --- src/PHPCR/Shell/Config/Config.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/PHPCR/Shell/Config/Config.php b/src/PHPCR/Shell/Config/Config.php index a3f8952..f0f2862 100644 --- a/src/PHPCR/Shell/Config/Config.php +++ b/src/PHPCR/Shell/Config/Config.php @@ -24,6 +24,7 @@ public function __construct($data) $this->data = $data; } + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { throw new \InvalidArgumentException(sprintf( @@ -32,16 +33,19 @@ public function offsetSet($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 +59,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); From 2f8358cfe432d5dacff2b85e6e8526b95fbca06f Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:16:40 +0200 Subject: [PATCH 07/21] Fix compatibility to Symfony 6 in SessionApplication and Table and drop PHP <=7.4 support --- .github/workflows/test-application.yaml | 24 ------------------- composer.json | 2 +- .../Application/SessionApplication.php | 4 ++-- src/PHPCR/Shell/Console/Helper/Table.php | 5 ++-- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 000cb01..b3f5639 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -20,30 +20,6 @@ jobs: matrix: include: - - php-version: '7.2' - dependencies: lowest - behat-suite: standalone - - - php-version: '7.2' - dependencies: lowest - behat-suite: embedded - - - php-version: '7.2' - dependencies: lowest - behat-suite: cli - - - php-version: '7.4' - dependencies: highest - behat-suite: standalone - - - php-version: '7.4' - dependencies: highest - behat-suite: embedded - - - php-version: '7.4' - dependencies: highest - behat-suite: cli - - php-version: '8.0' dependencies: highest behat-suite: standalone diff --git a/composer.json b/composer.json index 36a64b3..b3a0b0f 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", "require": { - "php": "^7.2 || ^8.0", + "php": "^8.0", "symfony/console": "^5.0 || ^6.0", "jackalope/jackalope": "^1.3.4", "phpcr/phpcr": "^2.1", diff --git a/src/PHPCR/Shell/Console/Application/SessionApplication.php b/src/PHPCR/Shell/Console/Application/SessionApplication.php index 1d713a8..ce9676c 100644 --- 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 index 109d302..c3a3a24 100644 --- 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() From e6533b5b69016240487caa051d4f937c678f39eb Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:24:28 +0200 Subject: [PATCH 08/21] Fix ProfileLoaderSpec test --- spec/PHPCR/Shell/Config/ProfileLoaderSpec.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php index 9af91fc..4f9ea3b 100644 --- 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', ]); From b2112041891b304b4b81c630ea67dc9aac42765b Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:25:26 +0200 Subject: [PATCH 09/21] Use behat cli from vendor/bin --- .github/workflows/test-application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index b3f5639..b1b0780 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -68,4 +68,4 @@ jobs: run: | vendor/bin/phpunit vendor/bin/phpspec run - vendor/behat/behat/bin/behat --suite=${{ matrix.behat-suite }} + vendor/behat/behat --suite=${{ matrix.behat-suite }} From 9df9384dae77d912176a04d29a44ef54d4ccd08d Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:26:20 +0200 Subject: [PATCH 10/21] Fix styleci --- src/PHPCR/Shell/Config/Config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PHPCR/Shell/Config/Config.php b/src/PHPCR/Shell/Config/Config.php index f0f2862..00679f6 100644 --- a/src/PHPCR/Shell/Config/Config.php +++ b/src/PHPCR/Shell/Config/Config.php @@ -29,7 +29,8 @@ 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 )); } From c3dc25eb9c959afd1e6f7005fe74216108b44cb5 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:29:14 +0200 Subject: [PATCH 11/21] Use ProphecyTrait to fix test warnings --- composer.json | 5 +++-- tests/PHPCR/Shell/Helper/NodeHelperTest.php | 3 +++ tests/PHPCR/Shell/Phpcr/PhpcrSessionTest.php | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b3a0b0f..c0c7807 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,12 @@ "dantleech/glob-finder": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.5", + "phpunit/phpunit": "^9.5", "behat/behat": "^3.6", "phpspec/phpspec": "^6.0 || ^7.0", "jackalope/jackalope-doctrine-dbal": "^1.3", - "jackalope/jackalope-jackrabbit": "^1.3" + "jackalope/jackalope-jackrabbit": "^1.3", + "phpspec/prophecy-phpunit": "^2.0" }, "suggest": { "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal", diff --git a/tests/PHPCR/Shell/Helper/NodeHelperTest.php b/tests/PHPCR/Shell/Helper/NodeHelperTest.php index 7495cb7..99bb833 100644 --- 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 index e98bf54..6e04ee8 100644 --- 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'); From 58b43e8725a5885408bd9a6de18240a258e371a7 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:30:56 +0200 Subject: [PATCH 12/21] Fix false changed behat cli path --- .github/workflows/test-application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index b1b0780..f599fce 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -68,4 +68,4 @@ jobs: run: | vendor/bin/phpunit vendor/bin/phpspec run - vendor/behat/behat --suite=${{ matrix.behat-suite }} + vendor/bin/behat --suite=${{ matrix.behat-suite }} From 4e7bcf084a8e9ca4f50b00133c940415013b583a Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:35:17 +0200 Subject: [PATCH 13/21] Test against lowest dependencies --- .github/workflows/test-application.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index f599fce..6f59506 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -21,15 +21,15 @@ jobs: matrix: include: - php-version: '8.0' - dependencies: highest + dependencies: lowest behat-suite: standalone - php-version: '8.0' - dependencies: highest + dependencies: lowest behat-suite: embedded - php-version: '8.0' - dependencies: highest + dependencies: lowest behat-suite: cli - php-version: '8.1' @@ -55,7 +55,7 @@ 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 }} From 9edb585c48a9add1cd5dca8b59d2e64cff78bce1 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 17:52:27 +0200 Subject: [PATCH 14/21] Replace assertContains with assertStringContainsString --- src/PHPCR/Shell/Test/ContextBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PHPCR/Shell/Test/ContextBase.php b/src/PHPCR/Shell/Test/ContextBase.php index 4558d2d..ca711e7 100644 --- a/src/PHPCR/Shell/Test/ContextBase.php +++ b/src/PHPCR/Shell/Test/ContextBase.php @@ -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); } /** @@ -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()); } } From 6d445e468a4145b17b2f6d3de71b4968e28edfa7 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 18:04:29 +0200 Subject: [PATCH 15/21] Increase dev dependencies lowest to avoid deprecation messages --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c0c7807..5302c23 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "behat/behat": "^3.6", - "phpspec/phpspec": "^6.0 || ^7.0", + "behat/behat": "^3.10", + "phpspec/phpspec": "^7.2", "jackalope/jackalope-doctrine-dbal": "^1.3", "jackalope/jackalope-jackrabbit": "^1.3", "phpspec/prophecy-phpunit": "^2.0" From 9a84bc1547aad776377af86fdc618892007e6d45 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 20 Apr 2022 19:05:07 +0200 Subject: [PATCH 16/21] Upgrade jackrabbit vesion in ci --- .github/workflows/test-application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 6f59506..67b74e0 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -62,7 +62,7 @@ jobs: - name: Start Jackrabbit run: | - tests/bin/travis_jackrabbit.sh + JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh - name: Execute test cases run: | From a06ebdee3e30205bdd640a05231376965f9436c8 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Fri, 29 Apr 2022 13:56:08 +0200 Subject: [PATCH 17/21] Update errors in context base script --- composer.json | 2 +- src/PHPCR/Shell/Test/ContextBase.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5302c23..c904a98 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "behat/behat": "^3.10", "phpspec/phpspec": "^7.2", "jackalope/jackalope-doctrine-dbal": "^1.3", - "jackalope/jackalope-jackrabbit": "^1.3", + "jackalope/jackalope-jackrabbit": "^1.4.3", "phpspec/prophecy-phpunit": "^2.0" }, "suggest": { diff --git a/src/PHPCR/Shell/Test/ContextBase.php b/src/PHPCR/Shell/Test/ContextBase.php index ca711e7..e377dc8 100644 --- 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; } @@ -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 )); } From 6c470b3fcd4e85f73e1523ae723f010bf4053868 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Mon, 2 May 2022 11:07:59 +0200 Subject: [PATCH 18/21] Test phpcr shell against forks --- .github/workflows/test-application.yaml | 1 + composer.json | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 67b74e0..651d423 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -14,6 +14,7 @@ jobs: env: SYMFONY_DEPRECATIONS_HELPER: ${{ matrix.symfony-deprecation-helper }} BEHAT_SUITE: ${{ matrix.behat-suite }} + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} strategy: fail-fast: false diff --git a/composer.json b/composer.json index c904a98..4129898 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,26 @@ { "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:alexander-schranz/jackalope-jackrabbit.git" + }, + { + "type": "vcs", + "url": "git@github.com:alexander-schranz/phpcr-utils.git" + }, + { + "type": "vcs", + "url": "git@github.com:alexander-schranz/jackalope.git" + } + ], "require": { "php": "^8.0", "symfony/console": "^5.0 || ^6.0", - "jackalope/jackalope": "^1.3.4", + "jackalope/jackalope": "dev-enhancement/php-8-1-issues as 1.4.5", "phpcr/phpcr": "^2.1", - "phpcr/phpcr-utils": "^1.2", + "phpcr/phpcr-utils": "dev-enhancement/php-8-1-issues as 1.6.2", "symfony/finder": "^5.0 || ^6.0", "symfony/serializer": "^5.0 || ^6.0", "symfony/yaml": "^5.0 || ^6.0", @@ -19,7 +33,7 @@ "behat/behat": "^3.10", "phpspec/phpspec": "^7.2", "jackalope/jackalope-doctrine-dbal": "^1.3", - "jackalope/jackalope-jackrabbit": "^1.4.3", + "jackalope/jackalope-jackrabbit": "dev-bugfix/content-type-parsing as 1.4.4", "phpspec/prophecy-phpunit": "^2.0" }, "suggest": { From a6b814c91c1c7785cb954fab4abb467261e1ce3d Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Mon, 2 May 2022 11:15:57 +0200 Subject: [PATCH 19/21] Fix assertStringNotContainsString --- src/PHPCR/Shell/Test/ContextBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PHPCR/Shell/Test/ContextBase.php b/src/PHPCR/Shell/Test/ContextBase.php index e377dc8..13868dc 100644 --- a/src/PHPCR/Shell/Test/ContextBase.php +++ b/src/PHPCR/Shell/Test/ContextBase.php @@ -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); } /** From 92b6a30f8d73c39c7bf8a7808155dbdc0b548589 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Mon, 2 May 2022 11:19:08 +0200 Subject: [PATCH 20/21] Test against forks --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 4129898..b87ab30 100644 --- a/composer.json +++ b/composer.json @@ -2,10 +2,6 @@ "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", "repositories": [ - { - "type": "vcs", - "url": "git@github.com:alexander-schranz/jackalope-jackrabbit.git" - }, { "type": "vcs", "url": "git@github.com:alexander-schranz/phpcr-utils.git" @@ -33,7 +29,7 @@ "behat/behat": "^3.10", "phpspec/phpspec": "^7.2", "jackalope/jackalope-doctrine-dbal": "^1.3", - "jackalope/jackalope-jackrabbit": "dev-bugfix/content-type-parsing as 1.4.4", + "jackalope/jackalope-jackrabbit": "dev-master as 1.4.4", "phpspec/prophecy-phpunit": "^2.0" }, "suggest": { From 54261299512ba75cf45083d56f8a81f57e7fbe2b Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Mon, 2 May 2022 14:58:16 +0200 Subject: [PATCH 21/21] Remove forks and uses released versions --- composer.json | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index b87ab30..6ef57e6 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,12 @@ { "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:alexander-schranz/phpcr-utils.git" - }, - { - "type": "vcs", - "url": "git@github.com:alexander-schranz/jackalope.git" - } - ], "require": { "php": "^8.0", "symfony/console": "^5.0 || ^6.0", - "jackalope/jackalope": "dev-enhancement/php-8-1-issues as 1.4.5", + "jackalope/jackalope": "^1.3.4", "phpcr/phpcr": "^2.1", - "phpcr/phpcr-utils": "dev-enhancement/php-8-1-issues as 1.6.2", + "phpcr/phpcr-utils": "^1.2", "symfony/finder": "^5.0 || ^6.0", "symfony/serializer": "^5.0 || ^6.0", "symfony/yaml": "^5.0 || ^6.0", @@ -29,7 +19,7 @@ "behat/behat": "^3.10", "phpspec/phpspec": "^7.2", "jackalope/jackalope-doctrine-dbal": "^1.3", - "jackalope/jackalope-jackrabbit": "dev-master as 1.4.4", + "jackalope/jackalope-jackrabbit": "^1.4.4", "phpspec/prophecy-phpunit": "^2.0" }, "suggest": {