From 281093d99cf98bdf3f11bc3dcb0361d06bd65d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 26 Apr 2021 17:15:03 +0200 Subject: [PATCH 01/85] [Composer] Set branch-alias and dependencies for master branch --- .travis.yml | 2 +- composer.json | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34932930..0eea47c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: env: global: - - PROJECT_VERSION=^3.3.x-dev + - PROJECT_VERSION=^4.0.x-dev - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml" - APP_ENV=behat - APP_DEBUG=1 diff --git a/composer.json b/composer.json index 6f13c731..0cd0e9c5 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "ezsystems/allure-behat": "^3.1@dev", "ezsystems/allure-php-api": "^3.1@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ezsystems/ezplatform-http-cache": "^2.1", - "ezsystems/ezplatform-kernel": "^1.3@dev", + "ezsystems/ezplatform-http-cache": "^3.0@dev", + "ezsystems/ezplatform-kernel": "^2.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -39,8 +39,9 @@ "symfony/yaml": "^5.0" }, "require-dev": { - "ibexa/ci-scripts": "^0.1@dev", - "ezsystems/doctrine-dbal-schema": "^1.0@dev", + "ibexa/ci-scripts": "^0.2@dev", + "ezsystems/doctrine-dbal-schema": "^2.0@dev", + "ezsystems/ezplatform-rest": "^2.0@dev", "ezsystems/ezplatform-code-style": "^0.1.0", "friendsofphp/php-cs-fixer": "^2.16.0", "mikey179/vfsstream": "^1.6" @@ -60,10 +61,8 @@ "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" }, "extra": { - "_ezplatform_branch_for_behat_tests": "master", "branch-alias": { - "dev-master": "8.3.x-dev", - "dev-tmp_ci_branch": "8.3.x-dev" + "dev-master": "9.0.x-dev" } }, "bin": ["bin/ezbehat", "bin/ezreport"] From 55ed419304670e57c2459640c56d594efed58709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20W=C3=B3js?= Date: Tue, 27 Apr 2021 13:52:01 +0200 Subject: [PATCH 02/85] Redirected errors output from child processes to ibexa:behat:generate-items in case of failure --- src/bundle/Command/CreateExampleDataManagerCommand.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bundle/Command/CreateExampleDataManagerCommand.php b/src/bundle/Command/CreateExampleDataManagerCommand.php index af08a6c1..455ca249 100644 --- a/src/bundle/Command/CreateExampleDataManagerCommand.php +++ b/src/bundle/Command/CreateExampleDataManagerCommand.php @@ -12,6 +12,7 @@ use EzSystems\Behat\Event\InitialEvent; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\ConsoleOutputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; @@ -133,6 +134,11 @@ private function createProcesses(OutputInterface $output, $data) while (count($this->processes)) { foreach ($this->processes as $i => $runningProcess) { if (!$runningProcess->isRunning()) { + if (!$runningProcess->isSuccessful()) { + $stderr = $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output; + $stderr->writeln($runningProcess->getErrorOutput()); + } + unset($this->processes[$i]); } sleep(1); From d0a1316ff08847fe5b353d1e00512c932d75c5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 6 Aug 2021 16:35:05 +0200 Subject: [PATCH 03/85] Renamed RightMenu and RightMenuContext (#201) --- behat_ibexa_commerce.yaml | 2 +- behat_ibexa_content.yaml | 2 +- behat_ibexa_experience.yaml | 2 +- behat_ibexa_oss.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 931c919e..78d2943a 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -43,6 +43,7 @@ regression: - EzSystems\Behat\API\Context\TrashContext - EzSystems\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext + - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext - Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext - Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext @@ -52,7 +53,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext - - Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext - Ibexa\AdminUi\Behat\BrowserContext\RolesContext - Ibexa\AdminUi\Behat\BrowserContext\SearchContext - Ibexa\AdminUi\Behat\BrowserContext\SectionsContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index b7facd2e..9103d75c 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -37,6 +37,7 @@ regression: - EzSystems\Behat\API\Context\TrashContext - EzSystems\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext + - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext - Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext - Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext @@ -46,7 +47,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext - - Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext - Ibexa\AdminUi\Behat\BrowserContext\RolesContext - Ibexa\AdminUi\Behat\BrowserContext\SearchContext - Ibexa\AdminUi\Behat\BrowserContext\SectionsContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index e5e7d6d3..2414c6e2 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -45,6 +45,7 @@ regression: - EzSystems\Behat\API\Context\TrashContext - EzSystems\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext + - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext - Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext - Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext @@ -54,7 +55,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext - - Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext - Ibexa\AdminUi\Behat\BrowserContext\RolesContext - Ibexa\AdminUi\Behat\BrowserContext\SearchContext - Ibexa\AdminUi\Behat\BrowserContext\SectionsContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index fe1c8ff6..46efa6fa 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -94,10 +94,12 @@ regression: - Behat\MinkExtension\Context\MinkContext - EzSystems\Behat\API\Context\ContentContext - EzSystems\Behat\API\Context\ContentTypeContext + - EzSystems\Behat\API\Context\RoleContext - EzSystems\Behat\API\Context\TestContext - EzSystems\Behat\API\Context\TrashContext - EzSystems\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext + - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext - Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext - Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext @@ -107,7 +109,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext - - Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext - Ibexa\AdminUi\Behat\BrowserContext\RolesContext - Ibexa\AdminUi\Behat\BrowserContext\SearchContext - Ibexa\AdminUi\Behat\BrowserContext\SectionsContext @@ -118,4 +119,3 @@ regression: - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext - Ibexa\User\Behat\Context\UserSetupContext - - EzSystems\Behat\API\Context\RoleContext From 14535641bd4d626e7be73d3cc904f5ad94d35ab0 Mon Sep 17 00:00:00 2001 From: tomaszszopinski <59650405+tomaszszopinski@users.noreply.github.com> Date: Tue, 14 Sep 2021 13:13:25 +0200 Subject: [PATCH 04/85] [Behat] fix for drag-mock (#210) --- src/bundle/Resources/encore/ez.config.manager.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bundle/Resources/encore/ez.config.manager.js b/src/bundle/Resources/encore/ez.config.manager.js index de29a18c..2fdfd387 100644 --- a/src/bundle/Resources/encore/ez.config.manager.js +++ b/src/bundle/Resources/encore/ez.config.manager.js @@ -21,6 +21,17 @@ module.exports = (eZConfig, eZConfigManager) => { ] }); + if (eZConfig.entry['ezplatform-admin-ui-content-type-edit-js']) { + const dragMockScriptPath = '../public/js/scripts/drag-mock.js'; + eZConfigManager.add({ + eZConfig, + entryName: 'ezplatform-admin-ui-content-type-edit-js', + newItems: [ + path.resolve(__dirname, dragMockScriptPath), + ], + }); + } + if (eZConfig.entry['ezplatform-page-builder-edit-js']) { const dragMockScriptPath = '../public/js/scripts/drag-mock.js'; eZConfigManager.add({ From cc8071603341660094725ee34edcae77354b7c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 4 Oct 2021 15:48:53 +0200 Subject: [PATCH 05/85] [Composer] Bumped dependencies for 4.0 version (#215) --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5b5d36df..082995d7 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "ezsystems/allure-behat": "^3.1@dev", "ezsystems/allure-php-api": "^3.1@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ezsystems/ezplatform-http-cache": "^3.0@dev", - "ezsystems/ezplatform-kernel": "^2.0@dev", + "ezsystems/ezplatform-http-cache": "^4.0@dev", + "ezsystems/ezplatform-kernel": "^4.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -41,8 +41,8 @@ }, "require-dev": { "ibexa/ci-scripts": "^0.2@dev", - "ezsystems/doctrine-dbal-schema": "^2.0@dev", - "ezsystems/ezplatform-rest": "^2.0@dev", + "ezsystems/doctrine-dbal-schema": "^4.0@dev", + "ezsystems/ezplatform-rest": "^4.0@dev", "ezsystems/ezplatform-code-style": "^1.0.0", "friendsofphp/php-cs-fixer": "^2.16.0", "mikey179/vfsstream": "^1.6" From da5f546421c23f1477f7930f80d3c526e4fe2e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 19 Oct 2021 14:10:29 +0200 Subject: [PATCH 06/85] Added ElementTransitionHasEnded condition (#220) * Added TransitionHasEnded condition - frontend * Added TransistionHasEnded condition - backend * Added transition has ended condition - tests --- .../Resources/encore/ez.config.manager.js | 82 +++++-------------- .../public/js/scripts/transition-listener.js | 3 + .../ElementTransitionHasEndedCondition.php | 50 +++++++++++ .../Debug/Highlighting/BaseElement.php | 11 --- tests/Browser/Element/BaseTestCase.php | 10 +-- .../Condition/ElementExistsConditionTest.php | 4 +- .../ElementNotExistsConditionTest.php | 6 +- ...ElementTransitionHasEndedConditionTest.php | 52 ++++++++++++ .../Condition/ElementsCountConditionTest.php | 4 +- .../ElementsCountGreaterThanConditionTest.php | 4 +- .../ChildElementTextCriterionTest.php | 10 +-- 11 files changed, 147 insertions(+), 89 deletions(-) create mode 100644 src/bundle/Resources/public/js/scripts/transition-listener.js create mode 100644 src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php create mode 100644 tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php diff --git a/src/bundle/Resources/encore/ez.config.manager.js b/src/bundle/Resources/encore/ez.config.manager.js index 2fdfd387..8095d78d 100644 --- a/src/bundle/Resources/encore/ez.config.manager.js +++ b/src/bundle/Resources/encore/ez.config.manager.js @@ -1,65 +1,27 @@ const path = require('path'); module.exports = (eZConfig, eZConfigManager) => { + const addEntry = ([entryName, newItems]) => { + if (eZConfig.entry[entryName]) { + eZConfigManager.add({ + eZConfig, + entryName, + newItems, + }); + } + }; + const seleniumDebugStylePath = path.resolve(__dirname, '../public/css/selenium-debug.css'); + const dragMockScriptPath = path.resolve(__dirname, '../public/js/scripts/drag-mock.js'); + const transitionListenerScriptPath = path.resolve(__dirname, '../public/js/scripts/transition-listener.js'); + const scriptsMap = { + 'ezcommerce-shop-pagelayout-css': [seleniumDebugStylePath], + 'ezplatform-admin-ui-content-type-edit-js': [dragMockScriptPath], + 'ezplatform-admin-ui-layout-css': [seleniumDebugStylePath], + 'ezplatform-admin-ui-layout-js': [transitionListenerScriptPath], + 'ezplatform-admin-ui-security-base-css': [seleniumDebugStylePath], + 'ezplatform-form-builder-common-js': [dragMockScriptPath], + 'ezplatform-page-builder-edit-js': [dragMockScriptPath], + }; - const dragMockScriptPath = '../public/js/scripts/drag-mock.js'; - const seleniumDebugStylePath = '../public/css/selenium-debug.css'; - - eZConfigManager.add({ - eZConfig, - entryName: 'ezplatform-admin-ui-layout-css', - newItems: [ - path.resolve(__dirname, seleniumDebugStylePath) - ] - }); - - eZConfigManager.add({ - eZConfig, - entryName: 'ezplatform-admin-ui-security-base-css', - newItems: [ - path.resolve(__dirname, seleniumDebugStylePath) - ] - }); - - if (eZConfig.entry['ezplatform-admin-ui-content-type-edit-js']) { - const dragMockScriptPath = '../public/js/scripts/drag-mock.js'; - eZConfigManager.add({ - eZConfig, - entryName: 'ezplatform-admin-ui-content-type-edit-js', - newItems: [ - path.resolve(__dirname, dragMockScriptPath), - ], - }); - } - - if (eZConfig.entry['ezplatform-page-builder-edit-js']) { - const dragMockScriptPath = '../public/js/scripts/drag-mock.js'; - eZConfigManager.add({ - eZConfig, - entryName: 'ezplatform-page-builder-edit-js', - newItems: [ - path.resolve(__dirname, dragMockScriptPath), - ], - }); - } - - if (eZConfig.entry['ezplatform-form-builder-common-js']) { - eZConfigManager.add({ - eZConfig, - entryName: 'ezplatform-form-builder-common-js', - newItems: [ - path.resolve(__dirname, dragMockScriptPath), - ], - }); - } - - if (eZConfig.entry['ezcommerce-shop-pagelayout-css']) { - eZConfigManager.add({ - eZConfig, - entryName: 'ezcommerce-shop-pagelayout-css', - newItems: [ - path.resolve(__dirname, seleniumDebugStylePath) - ] - }); - } + Object.entries(scriptsMap).forEach(addEntry); }; diff --git a/src/bundle/Resources/public/js/scripts/transition-listener.js b/src/bundle/Resources/public/js/scripts/transition-listener.js new file mode 100644 index 00000000..5e87822a --- /dev/null +++ b/src/bundle/Resources/public/js/scripts/transition-listener.js @@ -0,0 +1,3 @@ +const transitionEndedClass = 'ibexa-selenium-transition-ended'; +document.addEventListener('transitionstart', (event) => event.target.classList.remove(transitionEndedClass)); +document.addEventListener('transitionend', (event) => event.target.classList.add(transitionEndedClass)); diff --git a/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php new file mode 100644 index 00000000..9e7a1fa9 --- /dev/null +++ b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php @@ -0,0 +1,50 @@ +elementLocator = $elementLocator; + $this->searchedNode = $searchedNode; + } + + public function isMet(): bool + { + $currentTimeout = $this->searchedNode->getTimeout(); + $this->searchedNode->setTimeout(0); + $hasTransitionEndedClass = $this->searchedNode->find($this->elementLocator)->hasClass(self::TRANSITION_ENDED_CLASS); + $this->searchedNode->setTimeout($currentTimeout); + + return $hasTransitionEndedClass; + } + + public function getErrorMessage(BaseElementInterface $invokingElement): string + { + return sprintf( + "Transition has not ended for element with %s locator '%s': '%s'. Timeout value: %d seconds.", + strtoupper($this->elementLocator->getType()), + $this->elementLocator->getIdentifier(), + $this->elementLocator->getSelector(), + $invokingElement->getTimeout() + ); + } +} diff --git a/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php b/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php index 0251eaf2..f3f1e738 100644 --- a/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php +++ b/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php @@ -98,17 +98,6 @@ private function addClass(ElementInterface $element, string $class): void ); } - protected function removeClass(ElementInterface $element, string $class): void - { - $this->session->executeScript( - sprintf( - "%s.classList.remove('%s')", - $this->getElementScript($element), - $class - ) - ); - } - protected function markRead(ElementInterface $element): void { $this->addClass($element, self::READ_CLASS); diff --git a/tests/Browser/Element/BaseTestCase.php b/tests/Browser/Element/BaseTestCase.php index 502273ab..5703ab82 100644 --- a/tests/Browser/Element/BaseTestCase.php +++ b/tests/Browser/Element/BaseTestCase.php @@ -36,26 +36,26 @@ protected function createElement(string $elementText): ElementInterface return $element; } - protected function createElementWithChildElement(string $elementText, LocatorInterface $childLocator, string $childElementText): ElementInterface + protected function createElementWithChildElement(string $elementText, LocatorInterface $childLocator, ElementInterface $childElement): ElementInterface { $element = $this->createMock(ElementInterface::class); $element->method('getText')->willReturn($elementText); $element->method('getTimeout')->willReturn(1); - $element->method('find')->willReturnCallback(function () use ($childLocator, $childElementText) { + $element->method('find')->willReturnCallback(static function () use ($childLocator, $childElement) { /** @var \Ibexa\Behat\Browser\Locator\LocatorInterface $locator */ $locator = func_get_args()[0]; if ($locator == $childLocator) { - return $this->createElement($childElementText); + return $childElement; } throw new TimeoutException(); }); - $element->method('findAll')->willReturnCallback(function () use ($childLocator, $childElementText) { + $element->method('findAll')->willReturnCallback(function () use ($childLocator, $childElement) { /** @var \Ibexa\Behat\Browser\Locator\LocatorInterface $locator */ $locator = func_get_args()[0]; if ($locator == $childLocator) { - return $this->createCollection($childLocator, $childElementText); + return $this->createCollection($childLocator, $childElement->getText()); } return $this->createCollection($childLocator); diff --git a/tests/Browser/Element/Condition/ElementExistsConditionTest.php b/tests/Browser/Element/Condition/ElementExistsConditionTest.php index 5a0d2139..5bd21ff7 100644 --- a/tests/Browser/Element/Condition/ElementExistsConditionTest.php +++ b/tests/Browser/Element/Condition/ElementExistsConditionTest.php @@ -19,7 +19,7 @@ public function testElementExists(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $condition = new ElementExistsCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, 'ChildText'), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')), $searchedElementLocator ); @@ -29,7 +29,7 @@ public function testElementExists(): void public function testElementDoesNotExist(): void { $condition = new ElementExistsCondition( - $this->createElementWithChildElement('root', new CSSLocator('irrelevant-id', 'irrelevant-child'), 'ChildText'), + $this->createElementWithChildElement('root', new CSSLocator('irrelevant-id', 'irrelevant-child'), $this->createElement('ChildText')), new CSSLocator('searched-id', 'searched-test') ); diff --git a/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php b/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php index 7cce8a85..633192e0 100644 --- a/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php +++ b/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php @@ -20,7 +20,9 @@ public function testElementDoesNotExist(): void $searchedElementLocator = new CSSLocator('not-exist-id', 'not-exist-selector'); $condition = new ElementNotExistsCondition( $this->createElementWithChildElement( - 'root', new CSSLocator('dummy-id', 'dummy-selector'), 'DummyText', + 'root', + new CSSLocator('dummy-id', 'dummy-selector'), + $this->createElement('DummyText') ), $searchedElementLocator ); @@ -32,7 +34,7 @@ public function testElementExist(): void { $shouldNotExistLocator = new CSSLocator('should-not-exist-id', 'should-not-exist-selector'); $condition = new ElementNotExistsCondition( - $this->createElementWithChildElement('root', $shouldNotExistLocator, 'ChildText'), + $this->createElementWithChildElement('root', $shouldNotExistLocator, $this->createElement('ChildText')), $shouldNotExistLocator ); $invokingElement = $this->createElement('Test'); diff --git a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php new file mode 100644 index 00000000..ba81cb22 --- /dev/null +++ b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -0,0 +1,52 @@ +createStub(ElementInterface::class); + $childElement->method('getText')->willReturn('ChildText'); + $childElement->method('hasClass')->will($this->returnValueMap([ + ['ibexa-selenium-transition-ended', true], + ] + )); + + $condition = new ElementTransitionHasEndedCondition( + $this->createElementWithChildElement('root', $searchedElementLocator, $childElement), + $searchedElementLocator + ); + + Assert::assertTrue($condition->isMet()); + } + + public function testElementDoesNotHaveExpectedClass(): void + { + $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); + $baseElement = $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')); + $condition = new ElementTransitionHasEndedCondition( + $baseElement, + $searchedElementLocator + ); + + Assert::assertFalse($condition->isMet()); + Assert::assertEquals( + "Transition has not ended for element with CSS locator 'searched-id': 'searched-test'. Timeout value: 1 seconds.", + $condition->getErrorMessage($baseElement) + ); + } +} diff --git a/tests/Browser/Element/Condition/ElementsCountConditionTest.php b/tests/Browser/Element/Condition/ElementsCountConditionTest.php index 0569ae87..948b6413 100644 --- a/tests/Browser/Element/Condition/ElementsCountConditionTest.php +++ b/tests/Browser/Element/Condition/ElementsCountConditionTest.php @@ -19,7 +19,7 @@ public function testExpectedCountPresent(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $condition = new ElementsCountCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, 'ChildText'), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')), $searchedElementLocator, 1 ); @@ -31,7 +31,7 @@ public function testExpectedCountNotPresent(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $condition = new ElementsCountCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, 'ChildText'), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')), $searchedElementLocator, 0 ); diff --git a/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php b/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php index 88b0d681..360d5233 100644 --- a/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php +++ b/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php @@ -19,7 +19,7 @@ public function testExpectedCountPresent(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $condition = new ElementsCountGreaterThanCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, 'ChildText'), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')), $searchedElementLocator, 0 ); @@ -31,7 +31,7 @@ public function testExpectedCountNotPresent(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $condition = new ElementsCountGreaterThanCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, 'ChildText'), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')), $searchedElementLocator, 1 ); diff --git a/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php b/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php index 53bd6c08..f491086f 100644 --- a/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php +++ b/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php @@ -30,9 +30,9 @@ public function testMatches(ElementInterface $element, bool $shouldMatch): void public function dataProviderTestMatches(): array { return [ - [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'selector'), 'expectedChildText'), true], - [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'selector'), 'notExpectedChildText'), false], - [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'invalidSelector'), 'expectedChildText'), false], + [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'selector'), $this->createElement('expectedChildText')), true], + [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'selector'), $this->createElement('notExpectedChildText')), false], + [$this->createElementWithChildElement('ignore', new XPathLocator('id', 'invalidSelector'), $this->createElement('expectedChildText')), false], ]; } @@ -40,7 +40,7 @@ public function testGetErrorMessageWhenNoElementFound(): void { $childLocator = new XPathLocator('id', 'child-selector'); $criterion = new ChildElementTextCriterion($childLocator, 'expectedChildText'); - $invalidElement = $this->createElementWithChildElement('ignore', $childLocator, 'expectedChildText'); + $invalidElement = $this->createElementWithChildElement('ignore', $childLocator, $this->createElement('expectedChildText')); $criterion->matches($invalidElement); Assert::assertEquals( @@ -56,7 +56,7 @@ public function testGetErrorMessageWhenOtherElementFound(): void { $childLocator = new XPathLocator('id', 'child-selector'); $criterion = new ChildElementTextCriterion($childLocator, 'expectedChildText'); - $invalidElement = $this->createElementWithChildElement('ignore', $childLocator, 'notExpectedChildText'); + $invalidElement = $this->createElementWithChildElement('ignore', $childLocator, $this->createElement('notExpectedChildText')); $criterion->matches($invalidElement); Assert::assertEquals( From f6b0da92562682f6365127159c2c9f0e0651f500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 21 Oct 2021 11:34:04 +0200 Subject: [PATCH 07/85] [CI] Removed testing on PHP lower than 7.4 --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f53dfd10..335bc58a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: php: - - '7.3' - '7.4' composer_options: [ "" ] From 47ac898ebfb06d2fc76d3038f80f01ddb802d0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 3 Nov 2021 10:30:12 +0100 Subject: [PATCH 08/85] Mark items for which the transition has started (#224) --- .../public/js/scripts/transition-listener.js | 11 ++++- .../ElementTransitionHasEndedCondition.php | 30 ++++++++++--- ...ElementTransitionHasEndedConditionTest.php | 45 ++++++++++++++----- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/transition-listener.js b/src/bundle/Resources/public/js/scripts/transition-listener.js index 5e87822a..cb8d41b9 100644 --- a/src/bundle/Resources/public/js/scripts/transition-listener.js +++ b/src/bundle/Resources/public/js/scripts/transition-listener.js @@ -1,3 +1,10 @@ const transitionEndedClass = 'ibexa-selenium-transition-ended'; -document.addEventListener('transitionstart', (event) => event.target.classList.remove(transitionEndedClass)); -document.addEventListener('transitionend', (event) => event.target.classList.add(transitionEndedClass)); +const transitionStartedClass = 'ibexa-selenium-transition-started'; +document.addEventListener('transitionstart', (event) => { + event.target.classList.add(transitionStartedClass) + event.target.classList.remove(transitionEndedClass) +}); +document.addEventListener('transitionend', (event) => { + event.target.classList.add(transitionEndedClass) + event.target.classList.remove(transitionStartedClass) +}); diff --git a/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php index 9e7a1fa9..6f7fd3f8 100644 --- a/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php +++ b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php @@ -15,12 +15,17 @@ class ElementTransitionHasEndedCondition implements ConditionInterface { private const TRANSITION_ENDED_CLASS = 'ibexa-selenium-transition-ended'; + private const TRANSITION_STARTED_CLASS = 'ibexa-selenium-transition-started'; + /** @var \Ibexa\Behat\Browser\Locator\LocatorInterface */ private $elementLocator; /** @var \Ibexa\Behat\Browser\Element\BaseElementInterface */ private $searchedNode; + /** @var bool */ + private $hasStartedTransitioning; + public function __construct(BaseElementInterface $searchedNode, LocatorInterface $elementLocator) { $this->elementLocator = $elementLocator; @@ -31,6 +36,8 @@ public function isMet(): bool { $currentTimeout = $this->searchedNode->getTimeout(); $this->searchedNode->setTimeout(0); + + $this->hasStartedTransitioning = $this->searchedNode->find($this->elementLocator)->hasClass(self::TRANSITION_STARTED_CLASS); $hasTransitionEndedClass = $this->searchedNode->find($this->elementLocator)->hasClass(self::TRANSITION_ENDED_CLASS); $this->searchedNode->setTimeout($currentTimeout); @@ -39,12 +46,21 @@ public function isMet(): bool public function getErrorMessage(BaseElementInterface $invokingElement): string { - return sprintf( - "Transition has not ended for element with %s locator '%s': '%s'. Timeout value: %d seconds.", - strtoupper($this->elementLocator->getType()), - $this->elementLocator->getIdentifier(), - $this->elementLocator->getSelector(), - $invokingElement->getTimeout() - ); + return $this->hasStartedTransitioning ? + sprintf( + "Transition has not ended for element with %s locator '%s': '%s'. Timeout value: %d seconds.", + strtoupper($this->elementLocator->getType()), + $this->elementLocator->getIdentifier(), + $this->elementLocator->getSelector(), + $invokingElement->getTimeout() + ) + : + sprintf( + "Transition has not started at all for element with %s locator '%s': '%s'. Please make sure the condition is used on the correct element. Timeout value: %d seconds.", + strtoupper($this->elementLocator->getType()), + $this->elementLocator->getIdentifier(), + $this->elementLocator->getSelector(), + $invokingElement->getTimeout() + ); } } diff --git a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php index ba81cb22..b3358f0a 100644 --- a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php +++ b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -16,30 +16,25 @@ class ElementTransitionHasEndedConditionTest extends BaseTestCase { - public function testElementConditionHasEnded(): void + public function testElementTransitionHasEnded(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); - $childElement = $this->createStub(ElementInterface::class); - $childElement->method('getText')->willReturn('ChildText'); - $childElement->method('hasClass')->will($this->returnValueMap([ - ['ibexa-selenium-transition-ended', true], - ] - )); $condition = new ElementTransitionHasEndedCondition( - $this->createElementWithChildElement('root', $searchedElementLocator, $childElement), + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createChildElement(false, true)), $searchedElementLocator ); Assert::assertTrue($condition->isMet()); } - public function testElementDoesNotHaveExpectedClass(): void + public function testElementTransitionHasNotEndedInTime(): void { $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); $baseElement = $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')); + $condition = new ElementTransitionHasEndedCondition( - $baseElement, + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createChildElement(true, false)), $searchedElementLocator ); @@ -49,4 +44,34 @@ public function testElementDoesNotHaveExpectedClass(): void $condition->getErrorMessage($baseElement) ); } + + public function testElementTransitionHasNotStarted(): void + { + $searchedElementLocator = new CSSLocator('searched-id', 'searched-test'); + $baseElement = $this->createElementWithChildElement('root', $searchedElementLocator, $this->createElement('ChildText')); + + $condition = new ElementTransitionHasEndedCondition( + $this->createElementWithChildElement('root', $searchedElementLocator, $this->createChildElement(false, false)), + $searchedElementLocator + ); + + Assert::assertFalse($condition->isMet()); + Assert::assertEquals( + "Transition has not started at all for element with CSS locator 'searched-id': 'searched-test'. Please make sure the condition is used on the correct element. Timeout value: 1 seconds.", + $condition->getErrorMessage($baseElement) + ); + } + + private function createChildElement(bool $hasStartedTransition, bool $hasEndedTransition): ElementInterface + { + $childElement = $this->createStub(ElementInterface::class); + $childElement->method('getText')->willReturn('ChildText'); + $childElement->method('hasClass')->will($this->returnValueMap([ + ['ibexa-selenium-transition-started', $hasStartedTransition], + ['ibexa-selenium-transition-ended', $hasEndedTransition], + ] + )); + + return $childElement; + } } From db5a9a187065340e2920d73d417b75add038fcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 22 Nov 2021 11:38:04 +0100 Subject: [PATCH 09/85] Adjusted config files paths (#232) --- behat_ibexa_commerce.yaml | 36 +++++++++---------- behat_ibexa_content.yaml | 16 ++++----- behat_ibexa_experience.yaml | 32 ++++++++--------- behat_ibexa_oss.yaml | 18 +++++----- src/lib/Core/Context/ConfigurationContext.php | 2 +- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 0a790339..c624cd5c 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -1,7 +1,7 @@ imports: - behat_ibexa_experience.yaml - - vendor/ezsystems/ezcommerce-admin-ui/behat_suites.yml - - vendor/ezsystems/ezcommerce-shop/behat_suites.yml + - vendor/ibexa/commerce-admin-ui/behat_suites.yml + - vendor/ibexa/commerce-shop/behat_suites.yml regression: suites: @@ -10,7 +10,7 @@ regression: - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/setup/setup_experience.feature' + - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' contexts: - EzSystems\Behat\API\Context\ContentContext - EzSystems\Behat\API\Context\ContentTypeContext @@ -21,17 +21,17 @@ regression: - EzSystems\Behat\Core\Context\FileContext commerce: paths: - - '%paths.base%/vendor/ezsystems/date-based-publisher/features' - - '%paths.base%/vendor/ezsystems/ezcommerce-admin-ui/features/standard' - - '%paths.base%/vendor/ezsystems/ezcommerce-shop/features' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard' - - '%paths.base%/vendor/ezsystems/ezplatform-form-builder/features' - - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/DynamicLandingPage' - - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-page-fieldtype/features/eventSource' - - '%paths.base%/vendor/ezsystems/ezplatform-user/features/browser' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' + - '%paths.base%/vendor/ibexa/commerce-admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/commerce-shop/features' + - '%paths.base%/vendor/ibexa/admin-ui/features/personas' + - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/form-builder/features' + - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' + - '%paths.base%/vendor/ibexa/page-builder/features/personas' + - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' + - '%paths.base%/vendor/ibexa/user/features/browser' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken && @IbexaCommerce" contexts: @@ -63,10 +63,10 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext - - Ibexa\Commerce\ShopTools\Behat\Context\CheckoutContext - - Ibexa\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext - - Ibexa\Commerce\ShopTools\Behat\Context\FrontContext - - Ibexa\Commerce\ShopTools\Behat\Context\UserRegistrationContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\CheckoutContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\FrontContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\UserRegistrationContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext - Ibexa\FormBuilder\Behat\BrowserContext\FormAdministrationContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index b3725c96..7eb17673 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -1,7 +1,7 @@ imports: - behat_ibexa_oss.yaml - - vendor/ezsystems/date-based-publisher/behat_suites_content.yml - - vendor/ezsystems/ezplatform-workflow/behat_suites_content.yml + - vendor/ibexa/scheduler/behat_suites_content.yml + - vendor/ibexa/workflow/behat_suites_content.yml regression: suites: @@ -10,7 +10,7 @@ regression: - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/setup/setup_content.feature' + - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_content.feature' contexts: - EzSystems\Behat\API\Context\ContentContext - EzSystems\Behat\API\Context\ContentTypeContext @@ -21,11 +21,11 @@ regression: - EzSystems\Behat\Core\Context\FileContext content: paths: - - '%paths.base%/vendor/ezsystems/date-based-publisher/features' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard' - - '%paths.base%/vendor/ezsystems/ezplatform-user/features/browser' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' + - '%paths.base%/vendor/ibexa/admin-ui/features/personas' + - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/user/features/browser' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken && @IbexaContent" contexts: diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 8f8bf1f1..20263225 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -1,11 +1,11 @@ imports: - behat_ibexa_content.yaml - - vendor/ezsystems/date-based-publisher/behat_suites_experience.yml - - vendor/ezsystems/ezplatform-form-builder/behat_suites.yml - - vendor/ezsystems/ezplatform-page-builder/behat_suites.yml - - vendor/ezsystems/ezplatform-page-fieldtype/behat_suites.yml - - vendor/ezsystems/ezplatform-site-factory/behat_suites.yml - - vendor/ezsystems/ezplatform-workflow/behat_suites_experience.yml + - vendor/ibexa/scheduler/behat_suites_experience.yml + - vendor/ibexa/form-builder/behat_suites.yml + - vendor/ibexa/page-builder/behat_suites.yml + - vendor/ibexa/fieldtype-page/behat_suites.yml + - vendor/ibexa/site-factory/behat_suites.yml + - vendor/ibexa/workflow/behat_suites_experience.yml regression: suites: @@ -14,7 +14,7 @@ regression: - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/setup/setup_experience.feature' + - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' contexts: - EzSystems\Behat\API\Context\ContentContext - EzSystems\Behat\API\Context\ContentTypeContext @@ -25,15 +25,15 @@ regression: - EzSystems\Behat\Core\Context\FileContext experience: paths: - - '%paths.base%/vendor/ezsystems/date-based-publisher/features' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard' - - '%paths.base%/vendor/ezsystems/ezplatform-form-builder/features' - - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/DynamicLandingPage' - - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-page-fieldtype/features/eventSource' - - '%paths.base%/vendor/ezsystems/ezplatform-user/features/browser' - - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' + - '%paths.base%/vendor/ibexa/admin-ui/features/personas' + - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/form-builder/features' + - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' + - '%paths.base%/vendor/ibexa/page-builder/features/personas' + - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' + - '%paths.base%/vendor/ibexa/user/features/browser' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken && @IbexaExperience" contexts: diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index 46efa6fa..61fcf608 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -1,10 +1,10 @@ imports: - vendor/ezsystems/behatbundle/behat_suites.yml - - vendor/ezsystems/ezplatform-admin-ui/behat_suites.yml - - vendor/ezsystems/ezplatform-content-forms/behat_suites.yml - - vendor/ezsystems/ezplatform-http-cache/behat_suites.yml - - vendor/ezsystems/ezplatform-kernel/eZ/Bundle/EzPublishCoreBundle/behat_suites.yml - - vendor/ezsystems/ezplatform-user/behat_suites.yml + - vendor/ibexa/admin-ui/behat_suites.yml + - vendor/ibexa/content-forms/behat_suites.yml + - vendor/ibexa/http-cache/behat_suites.yml + - vendor/ibexa/core/src/bundle/Core/behat_suites.yaml + - vendor/ibexa/user/behat_suites.yml default: calls: @@ -17,7 +17,7 @@ default: output_path: '%paths.base%/build/allure' extensions: Behat\MinkExtension: - files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/' + files_path: '%paths.base%/vendor/ibexa/admin-ui/src/lib/Behat/TestFiles/' base_url: 'http://localhost' goutte: ~ javascript_session: selenium @@ -85,9 +85,9 @@ regression: - EzSystems\Behat\Core\Context\FileContext oss: paths: - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas' - - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard' - - '%paths.base%/vendor/ezsystems/ezplatform-user/features/browser' + - '%paths.base%/vendor/ibexa/admin-ui/features/personas' + - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/user/features/browser' filters: tags: "~@broken && @IbexaOSS" contexts: diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index f7b63262..e9a7ee5f 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -30,7 +30,7 @@ class ConfigurationContext implements Context public function __construct(string $projectDir, ConfigurationEditorInterface $configurationEditor) { $this->projectDir = $projectDir; - $this->ezplatformConfigFilePath = sprintf('%s/config/packages/ezplatform.yaml', $projectDir); + $this->ezplatformConfigFilePath = sprintf('%s/config/packages/ibexa.yaml', $projectDir); $this->configurationEditor = $configurationEditor; } From 5783b1ee37874e22f6f7cc69e87a574ee94fab42 Mon Sep 17 00:00:00 2001 From: Bogdan Mazur Date: Tue, 7 Dec 2021 14:57:29 +0100 Subject: [PATCH 10/85] [Behat] fixed context --- behat_ibexa_commerce.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 21c0c18f..0744ba00 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -66,7 +66,7 @@ regression: - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\CheckoutContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\FrontContext - - Ibexa\Commerce\ShopTools\Behat\Context\ProductVariantContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ProductVariantContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\UserRegistrationContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext From 8a99e363504326f693f09fe908acdcf6f4fe23ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 9 Dec 2021 16:48:16 +0100 Subject: [PATCH 11/85] Added workaround for taxonomy (#236) --- features/personas/subtree_editor.feature | 4 ++-- .../LimitationParser/LocationLimitationParser.php | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/features/personas/subtree_editor.feature b/features/personas/subtree_editor.feature index b44966a0..6c63ab1d 100644 --- a/features/personas/subtree_editor.feature +++ b/features/personas/subtree_editor.feature @@ -44,8 +44,8 @@ Feature: Editor that has access only to a Subtree of Content Structure | content | reverserelatedlist | And I create a role "ReadNodesForSubtreeEditors" And I add policy "content" "read" to "ReadNodesForSubtreeEditors" with limitations - | limitationType | limitationValue | - | Location | root,/FolderGrandParent | + | limitationType | limitationValue | + | Location | root,/FolderGrandParent,taxonomy/tags | And I add policy "content" "versionread" to "ReadNodesForSubtreeEditors" with limitations | limitationType | limitationValue | | Location | root,/FolderGrandParent | diff --git a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php index b1024ddf..6c1e072e 100644 --- a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php @@ -8,6 +8,7 @@ namespace EzSystems\Behat\API\Context\LimitationParser; +use eZ\Publish\API\Repository\Exceptions\NotFoundException; use eZ\Publish\API\Repository\LocationService; use eZ\Publish\API\Repository\URLAliasService; use eZ\Publish\API\Repository\Values\User\Limitation; @@ -38,8 +39,13 @@ public function parse(string $limitationValues): Limitation foreach (explode(',', $limitationValues) as $limitationValue) { $parsedUrl = $this->argumentParser->parseUrl($limitationValue); - $urlAlias = $this->urlAliasService->lookup($parsedUrl); - $location = $this->locationService->loadLocation($urlAlias->destination); + try { + $urlAlias = $this->urlAliasService->lookup($parsedUrl); + $location = $this->locationService->loadLocation($urlAlias->destination); + } catch (NotFoundException $exception) { + continue; + } + $values[] = $location->id; } From b33334e2cd42031ffbaf77891fdab6b016103db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 10 Dec 2021 15:19:11 +0100 Subject: [PATCH 12/85] key rebranding --- features/setup/loginMethods/email_provider.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/setup/loginMethods/email_provider.feature b/features/setup/loginMethods/email_provider.feature index d9e219bc..091e4f14 100644 --- a/features/setup/loginMethods/email_provider.feature +++ b/features/setup/loginMethods/email_provider.feature @@ -4,13 +4,13 @@ Feature: Email provider setup for testing Given I set configuration to "security.providers.ezplatform" in "config/packages/security.yaml" """ chain: - providers: [ ezplatform_email, ezplatform_username ] + providers: [ ibexa_email, ibexa_username ] """ And I append configuration to "security.providers" in "config/packages/security.yaml" """ - ezplatform_email: + ibexa_email: id: ezpublish.security.user_provider.email - ezplatform_username: + ibexa_username: id: ezpublish.security.user_provider.username """ And I append configuration to "security.firewalls.ezpublish_front" in "config/packages/security.yaml" From 327ed93a3ea0a384d5ba49e51c6c9f67181fd575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 13 Dec 2021 16:05:23 +0100 Subject: [PATCH 13/85] [CI] Adapted changes to the master branch --- .github/workflows/browser-tests.yaml | 4 ++-- .github/workflows/ci.yaml | 2 +- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 3171be6f..da4c9d29 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^3.3.x-dev' + project-version: '^4.0.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' secrets: @@ -23,7 +23,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^3.3.x-dev' + project-version: '^4.0.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c89c2ff0..98da68e5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: strategy: matrix: php: - - "7.3" + - "7.4" steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 7de05070..bd00d12e 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "ext-json": "*", "behat/behat": "^3.8", "behat/mink-goutte-driver": "^1.2", From 16734d137d4eb80c75c39e1813715d0499921805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 21 Dec 2021 10:34:43 +0100 Subject: [PATCH 14/85] Use non-deprecated entry names --- src/bundle/Resources/encore/ez.config.manager.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bundle/Resources/encore/ez.config.manager.js b/src/bundle/Resources/encore/ez.config.manager.js index 8095d78d..23c1ebec 100644 --- a/src/bundle/Resources/encore/ez.config.manager.js +++ b/src/bundle/Resources/encore/ez.config.manager.js @@ -14,13 +14,13 @@ module.exports = (eZConfig, eZConfigManager) => { const dragMockScriptPath = path.resolve(__dirname, '../public/js/scripts/drag-mock.js'); const transitionListenerScriptPath = path.resolve(__dirname, '../public/js/scripts/transition-listener.js'); const scriptsMap = { - 'ezcommerce-shop-pagelayout-css': [seleniumDebugStylePath], - 'ezplatform-admin-ui-content-type-edit-js': [dragMockScriptPath], - 'ezplatform-admin-ui-layout-css': [seleniumDebugStylePath], - 'ezplatform-admin-ui-layout-js': [transitionListenerScriptPath], - 'ezplatform-admin-ui-security-base-css': [seleniumDebugStylePath], - 'ezplatform-form-builder-common-js': [dragMockScriptPath], - 'ezplatform-page-builder-edit-js': [dragMockScriptPath], + 'ibexa-commerce-shop-pagelayout-css': [seleniumDebugStylePath], + 'ibexa-admin-ui-content-type-edit-js': [dragMockScriptPath], + 'ibexa-admin-ui-layout-css': [seleniumDebugStylePath], + 'ibexa-admin-ui-layout-js': [transitionListenerScriptPath], + 'ibexa-admin-ui-security-base-css': [seleniumDebugStylePath], + 'ibexa-form-builder-common-js': [dragMockScriptPath], + 'ibexa-page-builder-edit-js': [dragMockScriptPath], }; Object.entries(scriptsMap).forEach(addEntry); From e6c3ae30adc05d3cf9554cb397a0a4bf88913c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 22 Dec 2021 13:39:39 +0100 Subject: [PATCH 15/85] [Composer] Updated dependencies for master branch --- composer.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 1d7a1b8e..b4586a95 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "ezsystems/allure-behat": "^3.3.x-dev", "ezsystems/allure-php-api": "^3.3.x-dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ezsystems/ezplatform-http-cache": "^4.0@dev", - "ezsystems/ezplatform-kernel": "^4.0@dev", + "ibexa/http-cache": "^4.0@dev", + "ibexa/core": "^4.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -41,13 +41,11 @@ "psy/psysh": "^0.10.8" }, "require-dev": { - "ibexa/ci-scripts": "^0.2@dev", "ezsystems/doctrine-dbal-schema": "^4.0@dev", - "ezsystems/ezplatform-rest": "^4.0@dev", "ezsystems/ezplatform-code-style": "^1.0.0", - "ezsystems/ezplatform-http-cache": "^2.3@dev", - "ezsystems/ezplatform-rest": "^1.3@dev", "friendsofphp/php-cs-fixer": "^2.16.0", + "ibexa/ci-scripts": "^0.2@dev", + "ibexa/rest": "^4.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { From 20e9fb7ddd6f7c19e02d2ca3f7e7324a9aa0bd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 22 Dec 2021 13:48:54 +0100 Subject: [PATCH 16/85] [Composer] Fix dependencies for PHP8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b4586a95..071038c1 100644 --- a/composer.json +++ b/composer.json @@ -41,10 +41,10 @@ "psy/psysh": "^0.10.8" }, "require-dev": { - "ezsystems/doctrine-dbal-schema": "^4.0@dev", "ezsystems/ezplatform-code-style": "^1.0.0", "friendsofphp/php-cs-fixer": "^2.16.0", "ibexa/ci-scripts": "^0.2@dev", + "ibexa/doctrine-schema": "^4.0@dev", "ibexa/rest": "^4.0@dev", "mikey179/vfsstream": "^1.6" }, From a6e15f74c89ad5b7b6b5a04f5fa4db80c9359dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 23 Dec 2021 15:41:09 +0100 Subject: [PATCH 17/85] Fixed taxonomy location path (#244) * Fixed taxonomy location path * Fixed ArgumentParser * Fixed taxonomy workaround * fixup! Fixed ArgumentParser --- features/personas/subtree_editor.feature | 4 ++-- src/lib/Core/Behat/ArgumentParser.php | 12 ++++++++++-- tests/Core/Behat/ArgumentParserTest.php | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/features/personas/subtree_editor.feature b/features/personas/subtree_editor.feature index 6c63ab1d..cf52df4b 100644 --- a/features/personas/subtree_editor.feature +++ b/features/personas/subtree_editor.feature @@ -44,8 +44,8 @@ Feature: Editor that has access only to a Subtree of Content Structure | content | reverserelatedlist | And I create a role "ReadNodesForSubtreeEditors" And I add policy "content" "read" to "ReadNodesForSubtreeEditors" with limitations - | limitationType | limitationValue | - | Location | root,/FolderGrandParent,taxonomy/tags | + | limitationType | limitationValue | + | Location | root,/FolderGrandParent,/taxonomy/tags/root | And I add policy "content" "versionread" to "ReadNodesForSubtreeEditors" with limitations | limitationType | limitationValue | | Location | root,/FolderGrandParent | diff --git a/src/lib/Core/Behat/ArgumentParser.php b/src/lib/Core/Behat/ArgumentParser.php index 11f778d9..6479908c 100644 --- a/src/lib/Core/Behat/ArgumentParser.php +++ b/src/lib/Core/Behat/ArgumentParser.php @@ -35,9 +35,17 @@ public function __construct(RoleFacade $roleFacade, ParameterProviderInterface $ */ public function parseUrl(string $url) { - $url = str_replace([' ', '@', ',', ':', $this->parameterProvider->getParameter('root_content_name'), 'root'], ['-', '-', '', '-', '', ''], $url); + $url = str_replace([' ', '@', ',', ':', $this->parameterProvider->getParameter('root_content_name')], ['-', '-', '', '-', ''], $url); - return 0 === strpos($url, '/') ? $url : sprintf('/%s', $url); + if (strpos($url, '/') === 0) { + $url = substr($url, 1, strlen($url) - 1); + } + + if (strpos($url, 'root') === 0) { + $url = str_replace('root', '', $url); + } + + return strpos($url, '/') === 0 ? $url : sprintf('/%s', $url); } public function parseLimitations(TableNode $limitations) diff --git a/tests/Core/Behat/ArgumentParserTest.php b/tests/Core/Behat/ArgumentParserTest.php index 2e99572d..4fe7da8b 100644 --- a/tests/Core/Behat/ArgumentParserTest.php +++ b/tests/Core/Behat/ArgumentParserTest.php @@ -40,6 +40,10 @@ public function provideUrlData() return [ ['', '/'], ['root', '/'], + ['/root', '/'], + ['/root/taxonomy', '/taxonomy'], + ['root/taxonomy', '/taxonomy'], + ['/taxonomy/tags/root', '/taxonomy/tags/root'], ['/', '/'], ['/Home', '/Home'], ['Home', '/Home'], From 821ba7cde1ea818f3c07f4d296f28a7e24fa4f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 25 Jan 2022 10:42:48 +0100 Subject: [PATCH 18/85] Adjusted email provider setup --- features/setup/loginMethods/email_provider.feature | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/features/setup/loginMethods/email_provider.feature b/features/setup/loginMethods/email_provider.feature index 091e4f14..eec75f6b 100644 --- a/features/setup/loginMethods/email_provider.feature +++ b/features/setup/loginMethods/email_provider.feature @@ -1,7 +1,8 @@ Feature: Email provider setup for testing + @test Scenario: Set up both username and email providers - Given I set configuration to "security.providers.ezplatform" in "config/packages/security.yaml" + Given I set configuration to "security.providers.ibexa" in "config/packages/security.yaml" """ chain: providers: [ ibexa_email, ibexa_username ] @@ -9,11 +10,11 @@ Feature: Email provider setup for testing And I append configuration to "security.providers" in "config/packages/security.yaml" """ ibexa_email: - id: ezpublish.security.user_provider.email + id: Ibexa\Core\MVC\Symfony\Security\User\EmailProvider ibexa_username: - id: ezpublish.security.user_provider.username + id: Ibexa\Core\MVC\Symfony\Security\User\UsernameProvider """ - And I append configuration to "security.firewalls.ezpublish_front" in "config/packages/security.yaml" + And I append configuration to "security.firewalls.ibexa_front" in "config/packages/security.yaml" """ - provider: ezplatform + provider: ibexa """ From df6fa8be16c00237838b8477245fe50def334724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 25 Jan 2022 10:43:01 +0100 Subject: [PATCH 19/85] [CI] Run full setup before AdminUI tests --- .github/workflows/browser-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index da4c9d29..df722913 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -15,7 +15,7 @@ jobs: project-edition: 'oss' project-version: '^4.0.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' - test-setup-phase-1: '--profile=setup --suite=personas --mode=standard' + test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} examples: From 2dcfc165f60457b86e95e9b39dd797b731469c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 28 Jan 2022 16:14:49 +0100 Subject: [PATCH 20/85] Run rebranding Command --- composer.json | 2 +- .../Command/CreateExampleDataCommand.php | 2 +- .../CreateExampleDataManagerCommand.php | 2 +- src/bundle/Command/CreateLanguageCommand.php | 14 ++++----- .../Command/GetPullRequestDataCommand.php | 2 +- src/bundle/Command/TestSiteaccessCommand.php | 6 ++-- .../Controller/CurrentUserDataController.php | 8 ++--- src/bundle/Controller/ExceptionController.php | 2 +- src/bundle/Controller/RenderController.php | 6 ++-- .../BehatSiteAccessInitializer.php | 6 ++-- src/bundle/Resources/config/services.yaml | 24 +++++++-------- .../Resources/config/services/contexts.yaml | 6 ++-- .../services/fieldtype_data_providers.yaml | 16 +++++----- .../config/services/limitation_parsers.yaml | 12 ++++---- .../API/ContentData/ContentDataProvider.php | 12 ++++---- .../FieldTypeData/AuthorDataProvider.php | 4 +-- .../FieldTypeData/BinaryFileDataProvider.php | 2 +- .../FieldTypeData/BooleanDataProvider.php | 4 +-- .../FieldTypeData/CountryDataProvider.php | 2 +- .../FieldTypeData/DateDataProvider.php | 2 +- .../FieldTypeData/DateTimeDataProvider.php | 2 +- .../FieldTypeData/ImageAssetDataProvider.php | 18 +++++------ .../FieldTypeData/ImageDataProvider.php | 2 +- .../FieldTypeData/MapDataProvider.php | 2 +- .../FieldTypeData/MatrixDataProvider.php | 6 ++-- .../FieldTypeData/MediaDataProvider.php | 2 +- .../ObjectRelationDataProvider.php | 14 ++++----- .../ObjectRelationListDataProvider.php | 2 +- .../FieldTypeData/SelectionDataProvider.php | 4 +-- .../FieldTypeData/TimeDataProvider.php | 2 +- .../API/ContentData/RandomDataGenerator.php | 2 +- src/lib/API/Context/ContentTypeContext.php | 2 +- .../ContentTypeLimitationParser.php | 6 ++-- .../FieldGroupLimitationParser.php | 4 +-- .../LanguageLimitationParser.php | 4 +-- .../LimitationParserInterface.php | 2 +- .../LocationLimitationParser.php | 10 +++---- .../NewSectionLimitationParser.php | 6 ++-- .../NewStateLimitationParser.php | 6 ++-- .../ObjectStateLimitationParser.php | 4 +-- .../OwnerLimitationParser.php | 6 ++-- .../ParentContentTypeLimitationParser.php | 4 +-- .../ParentDepthLimitationParser.php | 2 +- .../ParentOwnerLimitationParser.php | 6 ++-- .../ParentUserGroupLimitationParser.php | 6 ++-- .../SectionLimitationParser.php | 6 ++-- .../SiteaccessLimitationParser.php | 4 +-- .../SubtreeLimitationParser.php | 8 ++--- .../UserGroupLimitationParser.php | 6 ++-- .../WorkflowStageLimitationParser.php | 4 +-- .../WorkflowTransitionLimitationParser.php | 4 +-- src/lib/API/Context/ObjectStateContext.php | 6 ++-- src/lib/API/Context/TestContext.php | 4 +-- src/lib/API/Facade/ContentFacade.php | 22 +++++++------- src/lib/API/Facade/ContentTypeFacade.php | 10 +++---- src/lib/API/Facade/LanguageFacade.php | 6 ++-- src/lib/API/Facade/RoleFacade.php | 6 ++-- src/lib/API/Facade/SearchFacade.php | 30 +++++++++---------- src/lib/API/Facade/TrashFacade.php | 14 ++++----- src/lib/API/Facade/UserFacade.php | 28 ++++++++--------- src/lib/Browser/Filter/BrowserLogFilter.php | 2 +- src/lib/Browser/Routing/Router.php | 6 ++-- .../SiteFactory/pagelayout1.html.twig | 2 +- .../SiteFactory/pagelayout10.html.twig | 2 +- .../SiteFactory/pagelayout11.html.twig | 2 +- .../SiteFactory/pagelayout12.html.twig | 2 +- .../SiteFactory/pagelayout13.html.twig | 2 +- .../SiteFactory/pagelayout14.html.twig | 2 +- .../SiteFactory/pagelayout15.html.twig | 2 +- .../SiteFactory/pagelayout16.html.twig | 2 +- .../SiteFactory/pagelayout17.html.twig | 2 +- .../SiteFactory/pagelayout18.html.twig | 2 +- .../SiteFactory/pagelayout19.html.twig | 2 +- .../SiteFactory/pagelayout2.html.twig | 2 +- .../SiteFactory/pagelayout20.html.twig | 2 +- .../SiteFactory/pagelayout3.html.twig | 2 +- .../SiteFactory/pagelayout4.html.twig | 2 +- .../SiteFactory/pagelayout5.html.twig | 2 +- .../SiteFactory/pagelayout6.html.twig | 2 +- .../SiteFactory/pagelayout7.html.twig | 2 +- .../SiteFactory/pagelayout8.html.twig | 2 +- .../SiteFactory/pagelayout9.html.twig | 2 +- src/lib/Event/TransitionEvent.php | 2 +- .../QueryType/FoldersUnderMediaQueryType.php | 6 ++-- src/lib/Subscriber/AbstractProcessStage.php | 10 +++---- src/lib/Subscriber/CreateContentDraft.php | 4 +-- src/lib/Subscriber/EditContent.php | 8 ++--- src/lib/Subscriber/InitialStage.php | 4 +-- src/lib/Subscriber/PublishDraft.php | 8 ++--- src/lib/Subscriber/PublishInTheFuture.php | 8 ++--- src/lib/Subscriber/Review.php | 8 ++--- tests/Browser/Filter/BrowserLogFilterTest.php | 4 +-- .../LocationAwareConfigurationEditorTest.php | 2 +- 93 files changed, 264 insertions(+), 264 deletions(-) diff --git a/composer.json b/composer.json index ff135343..35df3378 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "psy/psysh": "^0.10.8" }, "require-dev": { - "ezsystems/ezplatform-code-style": "^1.0.0", + "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^2.16.0", "ibexa/ci-scripts": "^0.2@dev", "ibexa/doctrine-schema": "^4.0@dev", diff --git a/src/bundle/Command/CreateExampleDataCommand.php b/src/bundle/Command/CreateExampleDataCommand.php index 200d9f34..8a00650d 100644 --- a/src/bundle/Command/CreateExampleDataCommand.php +++ b/src/bundle/Command/CreateExampleDataCommand.php @@ -8,7 +8,7 @@ namespace EzSystems\BehatBundle\Command; -use eZ\Bundle\EzPublishCoreBundle\Command\BackwardCompatibleCommand; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\InitialEvent; use Psr\Log\LoggerInterface; diff --git a/src/bundle/Command/CreateExampleDataManagerCommand.php b/src/bundle/Command/CreateExampleDataManagerCommand.php index b0f05683..184fa7b2 100644 --- a/src/bundle/Command/CreateExampleDataManagerCommand.php +++ b/src/bundle/Command/CreateExampleDataManagerCommand.php @@ -8,7 +8,7 @@ namespace EzSystems\BehatBundle\Command; -use eZ\Bundle\EzPublishCoreBundle\Command\BackwardCompatibleCommand; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use EzSystems\Behat\Event\InitialEvent; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; diff --git a/src/bundle/Command/CreateLanguageCommand.php b/src/bundle/Command/CreateLanguageCommand.php index f9639365..f62c36b5 100644 --- a/src/bundle/Command/CreateLanguageCommand.php +++ b/src/bundle/Command/CreateLanguageCommand.php @@ -8,10 +8,10 @@ namespace EzSystems\BehatBundle\Command; -use eZ\Bundle\EzPublishCoreBundle\Command\BackwardCompatibleCommand; -use eZ\Publish\API\Repository\LanguageService; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; +use Ibexa\Contracts\Core\Repository\LanguageService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -19,13 +19,13 @@ class CreateLanguageCommand extends Command implements BackwardCompatibleCommand { - /** @var \eZ\Publish\API\Repository\LanguageService */ + /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; - /** @var \eZ\Publish\API\Repository\UserService */ + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; - /** @var \eZ\Publish\API\Repository\PermissionResolver */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; public function __construct( diff --git a/src/bundle/Command/GetPullRequestDataCommand.php b/src/bundle/Command/GetPullRequestDataCommand.php index dfd7e22c..21358a97 100644 --- a/src/bundle/Command/GetPullRequestDataCommand.php +++ b/src/bundle/Command/GetPullRequestDataCommand.php @@ -8,7 +8,7 @@ namespace EzSystems\BehatBundle\Command; -use eZ\Bundle\EzPublishCoreBundle\Command\BackwardCompatibleCommand; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use GuzzleHttp\Psr7\Request; use Http\Client\Common\HttpMethodsClient; use Http\Discovery\HttpClientDiscovery; diff --git a/src/bundle/Command/TestSiteaccessCommand.php b/src/bundle/Command/TestSiteaccessCommand.php index 79b35c52..0f2571c4 100644 --- a/src/bundle/Command/TestSiteaccessCommand.php +++ b/src/bundle/Command/TestSiteaccessCommand.php @@ -8,15 +8,15 @@ namespace EzSystems\BehatBundle\Command; -use eZ\Bundle\EzPublishCoreBundle\Command\BackwardCompatibleCommand; -use eZ\Publish\Core\MVC\Symfony\SiteAccess; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; +use Ibexa\Core\MVC\Symfony\SiteAccess; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class TestSiteaccessCommand extends Command implements BackwardCompatibleCommand { - /** @var \eZ\Publish\Core\MVC\Symfony\SiteAccess */ + /** @var \Ibexa\Core\MVC\Symfony\SiteAccess */ private $siteaccess; public function __construct(SiteAccess $siteaccess) diff --git a/src/bundle/Controller/CurrentUserDataController.php b/src/bundle/Controller/CurrentUserDataController.php index 5e5fa58a..bc3ba751 100644 --- a/src/bundle/Controller/CurrentUserDataController.php +++ b/src/bundle/Controller/CurrentUserDataController.php @@ -8,8 +8,8 @@ namespace Ibexa\Bundle\Behat\Controller; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -17,11 +17,11 @@ class CurrentUserDataController extends AbstractController { /** - * @var \eZ\Publish\API\Repository\PermissionResolver + * @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; /** - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; diff --git a/src/bundle/Controller/ExceptionController.php b/src/bundle/Controller/ExceptionController.php index 8116db30..20a71375 100644 --- a/src/bundle/Controller/ExceptionController.php +++ b/src/bundle/Controller/ExceptionController.php @@ -8,7 +8,7 @@ namespace EzSystems\BehatBundle\Controller; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; class ExceptionController { diff --git a/src/bundle/Controller/RenderController.php b/src/bundle/Controller/RenderController.php index 9dbd31a2..3b1cb89a 100644 --- a/src/bundle/Controller/RenderController.php +++ b/src/bundle/Controller/RenderController.php @@ -8,9 +8,9 @@ namespace EzSystems\BehatBundle\Controller; -use eZ\Bundle\EzPublishCoreBundle\Controller; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\Core\MVC\Symfony\View\ContentView; +use Ibexa\Bundle\Core\Controller; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Core\MVC\Symfony\View\ContentView; class RenderController extends Controller { diff --git a/src/bundle/Initializer/BehatSiteAccessInitializer.php b/src/bundle/Initializer/BehatSiteAccessInitializer.php index ebaddfa5..6e6a93c0 100644 --- a/src/bundle/Initializer/BehatSiteAccessInitializer.php +++ b/src/bundle/Initializer/BehatSiteAccessInitializer.php @@ -10,9 +10,9 @@ use Behat\Behat\EventDispatcher\Event\ExampleTested; use Behat\Behat\EventDispatcher\Event\ScenarioTested; -use eZ\Publish\Core\MVC\Symfony\Event\ScopeChangeEvent; -use eZ\Publish\Core\MVC\Symfony\MVCEvents; -use eZ\Publish\Core\MVC\Symfony\SiteAccess; +use Ibexa\Core\MVC\Symfony\Event\ScopeChangeEvent; +use Ibexa\Core\MVC\Symfony\MVCEvents; +use Ibexa\Core\MVC\Symfony\SiteAccess; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\KernelInterface; diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml index e392dd39..1bd96f49 100644 --- a/src/bundle/Resources/config/services.yaml +++ b/src/bundle/Resources/config/services.yaml @@ -14,8 +14,8 @@ services: EzSystems\Behat\API\ContentData\ContentDataProvider: arguments: - - '@ezpublish.api.service.content_type' - - '@ezpublish.api.service.content' + - '@ibexa.api.service.content_type' + - '@ibexa.api.service.content' EzSystems\Behat\API\ContentData\RandomDataGenerator: ~ @@ -24,15 +24,15 @@ services: EzSystems\Behat\API\Facade\SearchFacade: arguments: - - '@eZ\Publish\API\Repository\URLAliasService' - - '@eZ\Publish\API\Repository\LocationService' - - '@ezpublish.api.service.search' + - '@Ibexa\Contracts\Core\Repository\URLAliasService' + - '@Ibexa\Contracts\Core\Repository\LocationService' + - '@ibexa.api.service.search' EzSystems\Behat\API\Facade\ContentTypeFacade: public: true arguments: - - '@ezpublish.api.service.content_type' - - '@ezpublish.cache_pool' + - '@ibexa.api.service.content_type' + - '@ibexa.cache_pool' EzSystems\Behat\API\Facade\RoleFacade: public: true @@ -57,9 +57,9 @@ services: EzSystems\BehatBundle\Command\CreateLanguageCommand: arguments: - $languageService: '@ezpublish.api.service.language' - $userService: '@ezpublish.api.service.user' - $permissionResolver: '@eZ\Publish\API\Repository\PermissionResolver' + $languageService: '@ibexa.api.service.language' + $userService: '@ibexa.api.service.user' + $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver' tags: - { name: console.command } @@ -73,7 +73,7 @@ services: EzSystems\BehatBundle\Command\TestSiteaccessCommand: arguments: - $siteaccess: '@ezpublish.siteaccess' + $siteaccess: '@Ibexa\Core\MVC\Symfony\SiteAccess' tags: - { name: console.command } @@ -86,7 +86,7 @@ services: Ibexa\Behat\Browser\Routing\Router: arguments: - $router: '@ezpublish.siteaccess_router' + $router: '@Ibexa\Core\MVC\Symfony\SiteAccess\Router' EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface: '@EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor' diff --git a/src/bundle/Resources/config/services/contexts.yaml b/src/bundle/Resources/config/services/contexts.yaml index f194a1af..8703a246 100644 --- a/src/bundle/Resources/config/services/contexts.yaml +++ b/src/bundle/Resources/config/services/contexts.yaml @@ -29,7 +29,7 @@ services: EzSystems\Behat\API\Context\ObjectStateContext: public: true arguments: - $objectStateService: '@ezpublish.api.service.object_state' + $objectStateService: '@ibexa.api.service.object_state' EzSystems\Behat\API\Context\RoleContext: public: true @@ -40,8 +40,8 @@ services: EzSystems\Behat\API\Context\TestContext: public: true arguments: - $userService: '@ezpublish.api.service.user' - $permissionResolver: '@eZ\Publish\API\Repository\PermissionResolver' + $userService: '@ibexa.api.service.user' + $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver' EzSystems\Behat\API\Context\UserContext: public: true diff --git a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml index 92669595..6169ce66 100644 --- a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml +++ b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml @@ -13,12 +13,12 @@ services: EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationDataProvider: arguments: - '@EzSystems\Behat\API\Facade\SearchFacade' - - '@ezpublish.api.service.content' + - '@ibexa.api.service.content' EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationListDataProvider: arguments: - '@EzSystems\Behat\API\Facade\SearchFacade' - - '@ezpublish.api.service.content' + - '@ibexa.api.service.content' EzSystems\Behat\API\ContentData\FieldTypeData\AuthorDataProvider: ~ @@ -29,7 +29,7 @@ services: EzSystems\Behat\API\ContentData\FieldTypeData\BooleanDataProvider: arguments: - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' - - '@eZ\Publish\API\Repository\ContentTypeService' + - '@Ibexa\Contracts\Core\Repository\ContentTypeService' EzSystems\Behat\API\ContentData\FieldTypeData\CountryDataProvider: ~ @@ -46,20 +46,20 @@ services: EzSystems\Behat\API\ContentData\FieldTypeData\MatrixDataProvider: arguments: - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' - - '@eZ\Publish\API\Repository\ContentTypeService' + - '@Ibexa\Contracts\Core\Repository\ContentTypeService' EzSystems\Behat\API\ContentData\FieldTypeData\SelectionDataProvider: arguments: - - '@eZ\Publish\API\Repository\ContentTypeService' + - '@Ibexa\Contracts\Core\Repository\ContentTypeService' EzSystems\Behat\API\ContentData\FieldTypeData\ImageAssetDataProvider: arguments: - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' - - '@eZ\Publish\Core\FieldType\ImageAsset\AssetMapper' + - '@Ibexa\Core\FieldType\ImageAsset\AssetMapper' - '@EzSystems\Behat\API\ContentData\FieldTypeData\ImageDataProvider' - '@EzSystems\Behat\Core\Behat\ArgumentParser' - - '@eZ\Publish\API\Repository\LocationService' - - '@eZ\Publish\API\Repository\URLAliasService' + - '@Ibexa\Contracts\Core\Repository\LocationService' + - '@Ibexa\Contracts\Core\Repository\URLAliasService' EzSystems\Behat\API\ContentData\FieldTypeData\ImageDataProvider: arguments: diff --git a/src/bundle/Resources/config/services/limitation_parsers.yaml b/src/bundle/Resources/config/services/limitation_parsers.yaml index 294f7dd7..9d7d4c93 100644 --- a/src/bundle/Resources/config/services/limitation_parsers.yaml +++ b/src/bundle/Resources/config/services/limitation_parsers.yaml @@ -10,27 +10,27 @@ services: EzSystems\Behat\API\Context\LimitationParser\ContentTypeLimitationParser: arguments: - - '@ezpublish.api.service.content_type' + - '@ibexa.api.service.content_type' EzSystems\Behat\API\Context\LimitationParser\FieldGroupLimitationParser: ~ EzSystems\Behat\API\Context\LimitationParser\LocationLimitationParser: arguments: - - '@ezpublish.api.service.url_alias' - - '@ezpublish.api.service.location' + - '@ibexa.api.service.url_alias' + - '@ibexa.api.service.location' - '@EzSystems\Behat\Core\Behat\ArgumentParser' EzSystems\Behat\API\Context\LimitationParser\NewSectionLimitationParser: arguments: - - '@ezpublish.api.service.section' + - '@ibexa.api.service.section' EzSystems\Behat\API\Context\LimitationParser\NewStateLimitationParser: arguments: - - '@ezpublish.api.service.object_state' + - '@ibexa.api.service.object_state' EzSystems\Behat\API\Context\LimitationParser\ObjectStateLimitationParser: arguments: - - '@ezpublish.api.service.object_state' + - '@ibexa.api.service.object_state' EzSystems\Behat\API\Context\LimitationParser\LanguageLimitationParser: ~ diff --git a/src/lib/API/ContentData/ContentDataProvider.php b/src/lib/API/ContentData/ContentDataProvider.php index b9da75ad..7fba3e15 100644 --- a/src/lib/API/ContentData/ContentDataProvider.php +++ b/src/lib/API/ContentData/ContentDataProvider.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\API\ContentData; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct; -use eZ\Publish\API\Repository\Values\Content\ContentStruct; -use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; class ContentDataProvider diff --git a/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php b/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php index a220285d..3024d51f 100644 --- a/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\Author\Author; -use eZ\Publish\Core\FieldType\Author\Value; +use Ibexa\Core\FieldType\Author\Author; +use Ibexa\Core\FieldType\Author\Value; class AuthorDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php b/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php index c9956869..df805cd4 100644 --- a/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\BinaryFile\Value; +use Ibexa\Core\FieldType\BinaryFile\Value; class BinaryFileDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php index 67f6fecf..dc085145 100644 --- a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; class BooleanDataProvider extends AbstractFieldTypeDataProvider { - /** @var \eZ\Publish\API\Repository\ContentTypeService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ private $contentTypeService; public function __construct(RandomDataGenerator $randomDataGenerator, ContentTypeService $contentTypeService) diff --git a/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php b/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php index 70bda62c..c4a565b9 100644 --- a/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\Country\Value; +use Ibexa\Core\FieldType\Country\Value; class CountryDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php b/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php index b7f67291..a77fbc68 100644 --- a/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php @@ -9,7 +9,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; use DateTime; -use eZ\Publish\Core\FieldType\Date\Value; +use Ibexa\Core\FieldType\Date\Value; class DateDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php index a359298a..8269d472 100644 --- a/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php @@ -9,7 +9,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; use DateTime; -use eZ\Publish\Core\FieldType\DateAndTime\Value; +use Ibexa\Core\FieldType\DateAndTime\Value; class DateTimeDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php index df00c03a..178cfacc 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php @@ -8,18 +8,18 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\Core\FieldType\ImageAsset\AssetMapper; -use eZ\Publish\Core\FieldType\ImageAsset\Value; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Core\FieldType\ImageAsset\AssetMapper; +use Ibexa\Core\FieldType\ImageAsset\Value; +use Ibexa\Core\MVC\ConfigResolverInterface; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Core\Behat\ArgumentParser; class ImageAssetDataProvider extends AbstractFieldTypeDataProvider { /** - * @var \eZ\Publish\Core\FieldType\ImageAsset\AssetMapper + * @var \Ibexa\Core\FieldType\ImageAsset\AssetMapper */ private $assetMapper; /** @@ -32,16 +32,16 @@ class ImageAssetDataProvider extends AbstractFieldTypeDataProvider */ private $argumentParser; /** - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; /** - * @var \eZ\Publish\API\Repository\URLAliasService + * @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; /** - * @var \eZ\Publish\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Core\MVC\ConfigResolverInterface */ private $configResolver; diff --git a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php index 21b529aa..826c1569 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\Image\Value; +use Ibexa\Core\FieldType\Image\Value; use EzSystems\Behat\API\ContentData\RandomDataGenerator; class ImageDataProvider extends AbstractFieldTypeDataProvider diff --git a/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php index 92865c21..547ba81d 100644 --- a/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\MapLocation\Value; +use Ibexa\Core\FieldType\MapLocation\Value; class MapDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php index 6553fbe3..707b378a 100644 --- a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php @@ -8,10 +8,10 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\EzPlatformMatrixFieldtype\FieldType\Value; -use EzSystems\EzPlatformMatrixFieldtype\FieldType\Value\Row; +use Ibexa\FieldTypeMatrix\FieldType\Value; +use Ibexa\FieldTypeMatrix\FieldType\Value\Row; class MatrixDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php index 7c59eb31..4740509d 100644 --- a/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\Media\Value; +use Ibexa\Core\FieldType\Media\Value; class MediaDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php index 2e556a9f..84543d5f 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php @@ -8,10 +8,10 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\Core\FieldType\Relation\Value; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Core\FieldType\Relation\Value; use EzSystems\Behat\API\Facade\SearchFacade; use EzSystems\Behat\Core\Behat\ArgumentParser; @@ -19,13 +19,13 @@ class ObjectRelationDataProvider implements FieldTypeDataProviderInterface { /** @var \EzSystems\Behat\API\Facade\SearchFacade */ protected $searchFacade; - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; - /** @var \eZ\Publish\API\Repository\URLAliasService */ + /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php index cab3773a..d9543959 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\Core\FieldType\RelationList\Value; +use Ibexa\Core\FieldType\RelationList\Value; class ObjectRelationListDataProvider extends ObjectRelationDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php b/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php index 3fc42db8..d8908cc2 100644 --- a/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\Core\FieldType\Selection\Value; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Core\FieldType\Selection\Value; class SelectionDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php index 43d1ee9a..b32fc9a4 100644 --- a/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php @@ -9,7 +9,7 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; use DateTime; -use eZ\Publish\Core\FieldType\Time\Value; +use Ibexa\Core\FieldType\Time\Value; class TimeDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/RandomDataGenerator.php b/src/lib/API/ContentData/RandomDataGenerator.php index d1afbad5..cbda499b 100644 --- a/src/lib/API/ContentData/RandomDataGenerator.php +++ b/src/lib/API/ContentData/RandomDataGenerator.php @@ -9,7 +9,7 @@ namespace EzSystems\Behat\API\ContentData; use DateTime; -use eZ\Publish\Core\MVC\Symfony\Locale\LocaleConverterInterface; +use Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface; use Faker; use Faker\Generator; diff --git a/src/lib/API/Context/ContentTypeContext.php b/src/lib/API/Context/ContentTypeContext.php index 290b9db5..19b26e69 100644 --- a/src/lib/API/Context/ContentTypeContext.php +++ b/src/lib/API/Context/ContentTypeContext.php @@ -10,7 +10,7 @@ use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; use EzSystems\Behat\API\Facade\ContentTypeFacade; class ContentTypeContext implements Context diff --git a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php index 4a1ec40a..7f38d210 100644 --- a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\ContentTypeLimitation; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation; class ContentTypeLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php index 67f52414..e8605d37 100644 --- a/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use Ibexa\Platform\Contracts\Permissions\Repository\Values\User\Limitation\FieldGroupLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Permissions\Repository\Values\User\Limitation\FieldGroupLimitation; class FieldGroupLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php b/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php index 155974a8..de6d8358 100644 --- a/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\LanguageLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation; class LanguageLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php index de7f29bb..9e8b8fe5 100644 --- a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php +++ b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; interface LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php index 6c1e072e..5dc0b115 100644 --- a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php @@ -8,11 +8,11 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\LocationLimitation; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation; use EzSystems\Behat\Core\Behat\ArgumentParser; class LocationLimitationParser implements LimitationParserInterface diff --git a/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php b/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php index 2202896f..038a6f40 100644 --- a/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\NewSectionLimitation; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\NewSectionLimitation; class NewSectionLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php b/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php index fdab7fbd..25f2c9a1 100644 --- a/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\ObjectStateService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\NewObjectStateLimitation; +use Ibexa\Contracts\Core\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\NewObjectStateLimitation; class NewStateLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php b/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php index b34fc1f9..b69304e4 100644 --- a/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\ObjectStateLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation; class ObjectStateLimitationParser extends NewStateLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php b/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php index 96e087f9..cc0f2e47 100644 --- a/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\OwnerLimitation; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; class OwnerLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php index e23630ab..fbe79711 100644 --- a/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\ParentContentTypeLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation; class ParentContentTypeLimitationParser extends ContentTypeLimitationParser { diff --git a/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php index b746204e..687b0c57 100644 --- a/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; class ParentDepthLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php index d4b43496..7681d6c1 100644 --- a/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\ParentOwnerLimitation; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; class ParentOwnerLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php index 06c5205b..f790d814 100644 --- a/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\ParentUserGroupLimitation; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; class ParentUserGroupLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/SectionLimitationParser.php b/src/lib/API/Context/LimitationParser/SectionLimitationParser.php index 58dc6af2..0cd95822 100644 --- a/src/lib/API/Context/LimitationParser/SectionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SectionLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation; class SectionLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php b/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php index 274aaf56..84549fc2 100644 --- a/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\SiteAccessLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SiteAccessLimitation; class SiteaccessLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php index 0631e371..40f5855e 100644 --- a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php @@ -8,10 +8,10 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\SubtreeLimitation; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation; class SubtreeLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php index 72d3c086..ba4138e3 100644 --- a/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\User\Limitation\UserGroupLimitation; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; class UserGroupLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php b/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php index 6e81b102..469e747f 100644 --- a/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use EzSystems\EzPlatformWorkflow\Value\Limitation\WorkflowStageLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Workflow\Value\Limitation\WorkflowStageLimitation; class WorkflowStageLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php b/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php index ecd4053d..a21842ff 100644 --- a/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\Context\LimitationParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use EzSystems\EzPlatformWorkflow\Value\Limitation\WorkflowTransitionLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Workflow\Value\Limitation\WorkflowTransitionLimitation; class WorkflowTransitionLimitationParser implements LimitationParserInterface { diff --git a/src/lib/API/Context/ObjectStateContext.php b/src/lib/API/Context/ObjectStateContext.php index 8ab38af7..ae18e272 100644 --- a/src/lib/API/Context/ObjectStateContext.php +++ b/src/lib/API/Context/ObjectStateContext.php @@ -10,12 +10,12 @@ use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; -use eZ\Publish\API\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\ObjectStateService; class ObjectStateContext implements Context { - /** @var \eZ\Publish\API\Repository\ObjectStateService */ + /** @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ private $objectStateService; public function __construct(ObjectStateService $objectStateService) diff --git a/src/lib/API/Context/TestContext.php b/src/lib/API/Context/TestContext.php index 645a650d..036cd4c0 100644 --- a/src/lib/API/Context/TestContext.php +++ b/src/lib/API/Context/TestContext.php @@ -10,8 +10,8 @@ use Behat\Behat\Context\Context; use Behat\Behat\Hook\Scope\BeforeScenarioScope; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; class TestContext implements Context { diff --git a/src/lib/API/Facade/ContentFacade.php b/src/lib/API/Facade/ContentFacade.php index 4eaa4710..50671bba 100644 --- a/src/lib/API/Facade/ContentFacade.php +++ b/src/lib/API/Facade/ContentFacade.php @@ -8,26 +8,26 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Repository; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\Values\Content\Content; -use eZ\Publish\API\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\URLAlias; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Repository; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\Values\Content\Content; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; use EzSystems\Behat\API\ContentData\ContentDataProvider; use FOS\HttpCacheBundle\CacheManager; use PHPUnit\Framework\Assert; class ContentFacade { - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; - /** @var \eZ\Publish\API\Repository\URLAliasService */ + /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ @@ -36,7 +36,7 @@ class ContentFacade /** @var \FOS\HttpCacheBundle\CacheManager */ private $cacheManager; - /** @var \eZ\Publish\API\Repository\Repository */ + /** @var \Ibexa\Contracts\Core\Repository\Repository */ private $repository; public function __construct( diff --git a/src/lib/API/Facade/ContentTypeFacade.php b/src/lib/API/Facade/ContentTypeFacade.php index 5348985c..4405e679 100644 --- a/src/lib/API/Facade/ContentTypeFacade.php +++ b/src/lib/API/Facade/ContentTypeFacade.php @@ -8,10 +8,10 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; use EzSystems\Behat\API\ContentData\FieldTypeNameConverter; use Ibexa\Core\Persistence\Cache\Identifier\CacheIdentifierGeneratorInterface; use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface; @@ -22,7 +22,7 @@ class ContentTypeFacade private const CONTENT_TYPE_LIST_BY_GROUP_IDENTIFIER = 'content_type_list_by_group'; - /** @var \eZ\Publish\API\Repository\ContentTypeService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ private $contentTypeService; /** @var \Symfony\Component\Cache\Adapter\TagAwareAdapterInterface */ diff --git a/src/lib/API/Facade/LanguageFacade.php b/src/lib/API/Facade/LanguageFacade.php index 602103fa..0d6c7a46 100644 --- a/src/lib/API/Facade/LanguageFacade.php +++ b/src/lib/API/Facade/LanguageFacade.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\LanguageService; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\LanguageService; class LanguageFacade { - /** @var \eZ\Publish\API\Repository\LanguageService */ + /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; public function __construct(LanguageService $languageService) diff --git a/src/lib/API/Facade/RoleFacade.php b/src/lib/API/Facade/RoleFacade.php index 6e4d85af..c9bf3d8c 100644 --- a/src/lib/API/Facade/RoleFacade.php +++ b/src/lib/API/Facade/RoleFacade.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\RoleService; use EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector; class RoleFacade { - /** @var \eZ\Publish\API\Repository\RoleService */ + /** @var \Ibexa\Contracts\Core\Repository\RoleService */ private $roleService; /** @var \EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector */ diff --git a/src/lib/API/Facade/SearchFacade.php b/src/lib/API/Facade/SearchFacade.php index 4f1fcdf3..6fbd5e5a 100644 --- a/src/lib/API/Facade/SearchFacade.php +++ b/src/lib/API/Facade/SearchFacade.php @@ -8,31 +8,31 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\SearchService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\Values\Content\LocationQuery; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationId; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Subtree; -use eZ\Publish\API\Repository\Values\Content\URLAlias; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\SearchService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationId; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Subtree; +use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; use PHPUnit\Framework\Assert; class SearchFacade { - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; - /** @var \eZ\Publish\API\Repository\URLAliasService */ + /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; - /** @var \eZ\Publish\API\Repository\SearchService */ + /** @var \Ibexa\Contracts\Core\Repository\SearchService */ private $searchService; /** - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; diff --git a/src/lib/API/Facade/TrashFacade.php b/src/lib/API/Facade/TrashFacade.php index e8590156..5140736e 100644 --- a/src/lib/API/Facade/TrashFacade.php +++ b/src/lib/API/Facade/TrashFacade.php @@ -8,21 +8,21 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\TrashService; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\Values\Content\URLAlias; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\TrashService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; use PHPUnit\Framework\Assert; class TrashFacade { - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; - /** @var \eZ\Publish\API\Repository\URLAliasService */ + /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; - /** @var \eZ\Publish\API\Repository\TrashService */ + /** @var \Ibexa\Contracts\Core\Repository\TrashService */ private $trashService; public function __construct(LocationService $locationService, URLAliasService $urlAliasService, TrashService $trashService) diff --git a/src/lib/API/Facade/UserFacade.php b/src/lib/API/Facade/UserFacade.php index f72d0145..1a1f65ba 100644 --- a/src/lib/API/Facade/UserFacade.php +++ b/src/lib/API/Facade/UserFacade.php @@ -8,15 +8,15 @@ namespace EzSystems\Behat\API\Facade; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\RoleService; -use eZ\Publish\API\Repository\SearchService; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation; -use eZ\Publish\API\Repository\Values\User\UserGroup; -use eZ\Publish\Core\Base\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\SearchService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroup; +use Ibexa\Core\Base\Exceptions\NotFoundException; use EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider; use EzSystems\Behat\API\ContentData\RandomDataGenerator; @@ -25,16 +25,16 @@ class UserFacade public const USER_CONTENT_TYPE_IDENTIFIER = 'user'; public const USERGROUP_CONTENT_IDENTIFIER = 'user_group'; public const ROOT_USERGROUP_CONTENT_ID = 4; - /** @var \eZ\Publish\API\Repository\UserService */ + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; - /** @var \eZ\Publish\API\Repository\ContentTypeService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ private $contentTypeService; - /** @var \eZ\Publish\API\Repository\RoleService */ + /** @var \Ibexa\Contracts\Core\Repository\RoleService */ private $roleService; - /** @var \eZ\Publish\API\Repository\SearchService */ + /** @var \Ibexa\Contracts\Core\Repository\SearchService */ private $searchService; /** @@ -137,7 +137,7 @@ private function loadLegacyUserGroupByName(string $userGroupName): UserGroup $result = $this->searchService->findContent($query); foreach ($result->searchHits as $searchHit) { - /** @var \eZ\Publish\API\Repository\Values\Content\Content $content */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $content */ $content = $searchHit->valueObject; if ($content->contentInfo->name === $userGroupName) { diff --git a/src/lib/Browser/Filter/BrowserLogFilter.php b/src/lib/Browser/Filter/BrowserLogFilter.php index ec7af916..201b6e05 100644 --- a/src/lib/Browser/Filter/BrowserLogFilter.php +++ b/src/lib/Browser/Filter/BrowserLogFilter.php @@ -11,7 +11,7 @@ class BrowserLogFilter { private $excludedPatterns = [ - '@.*/api/ezp/v2/bookmark/.* - Failed to load resource: the server responded with a status of 404 \(Not Found\)@', + '@.*/api/ibexa/v2/bookmark/.* - Failed to load resource: the server responded with a status of 404 \(Not Found\)@', '@.*/bundles/netgentags/admin/jstree/js/jstree.min.js 5 document.registerElement is deprecated and will be removed in M73, around March 2019. Please use window.customElements.define instead. See https://www.chromestatus.com/features/4642138092470272 for more details.@', '@.*/admin/version-draft/has-no-conflict/.* - Failed to load resource: the server responded with a status of 409 \(Conflict\)@', '@webpack:///./vendor/ezsystems/ezplatform-admin-ui/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js\? 91:12 "EzObjectRelation fieldtype is deprecated. Please, use EzObjectRelationList fieldtype instead."@', diff --git a/src/lib/Browser/Routing/Router.php b/src/lib/Browser/Routing/Router.php index 4894d531..d030bc43 100644 --- a/src/lib/Browser/Routing/Router.php +++ b/src/lib/Browser/Routing/Router.php @@ -8,13 +8,13 @@ namespace Ibexa\Behat\Browser\Routing; -use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest; -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router as CoreRouter; +use Ibexa\Core\MVC\Symfony\Routing\SimplifiedRequest; +use Ibexa\Core\MVC\Symfony\SiteAccess\Router as CoreRouter; use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters; final class Router { - /** @var \eZ\Publish\Core\MVC\Symfony\SiteAccess\Router */ + /** @var \Ibexa\Core\MVC\Symfony\SiteAccess\Router */ private $router; /** @var \FriendsOfBehat\SymfonyExtension\Mink\MinkParameters */ diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig index ee2ee620..6a94beee 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig index 7f248a3e..0f3d0090 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig index 5e6ddc2d..9735ece4 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig index 3ebc7948..8da6f893 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig index ec17ce7e..74baad58 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig index 943c6354..bb052d74 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig index 3fac96fe..4fef77e4 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig index 35d3c37f..328d2926 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig index bd3d3d9a..86cab435 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig index 432cd006..d36e9f3d 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig index 6d0e42b1..8ca0d3cd 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig index 0d0e69ea..7505bbec 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig index 701d187e..0812ea6b 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig index d87e9f00..7f5cd46c 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig index f823754f..ebdad082 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig index 8d7b6e98..a61af14b 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig index 4b89478e..91b1e5f3 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig index 02faa192..03e9aecb 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig index 58b41efd..6de48be8 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig index 190a5e8d..22ad874e 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig @@ -1,7 +1,7 @@ - + {% if content is defined and title is not defined %} {% set title = ez_content_name( content ) %} diff --git a/src/lib/Event/TransitionEvent.php b/src/lib/Event/TransitionEvent.php index aa63ac13..5c6e261c 100644 --- a/src/lib/Event/TransitionEvent.php +++ b/src/lib/Event/TransitionEvent.php @@ -18,7 +18,7 @@ class TransitionEvent extends Event /** @var string */ public $contentTypeIdentifier; - /** @var \eZ\Publish\API\Repository\Values\Content\Content */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */ public $content; /** @var array */ diff --git a/src/lib/QueryType/FoldersUnderMediaQueryType.php b/src/lib/QueryType/FoldersUnderMediaQueryType.php index 9cf0024f..22c61908 100644 --- a/src/lib/QueryType/FoldersUnderMediaQueryType.php +++ b/src/lib/QueryType/FoldersUnderMediaQueryType.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\QueryType; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\QueryType\QueryType; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\QueryType\QueryType; class FoldersUnderMediaQueryType implements QueryType { diff --git a/src/lib/Subscriber/AbstractProcessStage.php b/src/lib/Subscriber/AbstractProcessStage.php index a9ab12e9..23345ed7 100644 --- a/src/lib/Subscriber/AbstractProcessStage.php +++ b/src/lib/Subscriber/AbstractProcessStage.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\Values\User\User; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\Values\User\User; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\TransitionEvent; use PHPUnit\Framework\Assert; @@ -24,10 +24,10 @@ abstract class AbstractProcessStage /** @var \Psr\Log\LoggerInterface */ protected $logger; - /** @var \eZ\Publish\API\Repository\UserService */ + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; - /** @var \eZ\Publish\API\Repository\PermissionResolver */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; /** @var \Symfony\Component\EventDispatcher\EventDispatcher */ diff --git a/src/lib/Subscriber/CreateContentDraft.php b/src/lib/Subscriber/CreateContentDraft.php index f1f535b2..7d3d0b52 100644 --- a/src/lib/Subscriber/CreateContentDraft.php +++ b/src/lib/Subscriber/CreateContentDraft.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\API\Facade\ContentFacade; use EzSystems\Behat\Event\Events; diff --git a/src/lib/Subscriber/EditContent.php b/src/lib/Subscriber/EditContent.php index 4292339e..5766f356 100644 --- a/src/lib/Subscriber/EditContent.php +++ b/src/lib/Subscriber/EditContent.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\ContentDataProvider; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; @@ -25,7 +25,7 @@ class EditContent extends AbstractProcessStage implements EventSubscriberInterfa /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ private $contentDataProvider; - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; /** @var \Ibexa\Workflow\Behat\Facade\WorkflowFacade */ diff --git a/src/lib/Subscriber/InitialStage.php b/src/lib/Subscriber/InitialStage.php index a0c83405..32e3c938 100644 --- a/src/lib/Subscriber/InitialStage.php +++ b/src/lib/Subscriber/InitialStage.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\API\Facade\SearchFacade; use EzSystems\Behat\Event\Events; diff --git a/src/lib/Subscriber/PublishDraft.php b/src/lib/Subscriber/PublishDraft.php index df775b5c..fae7d715 100644 --- a/src/lib/Subscriber/PublishDraft.php +++ b/src/lib/Subscriber/PublishDraft.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; @@ -21,7 +21,7 @@ class PublishDraft extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; /** @var \Ibexa\Workflow\Behat\Facade\WorkflowFacade */ diff --git a/src/lib/Subscriber/PublishInTheFuture.php b/src/lib/Subscriber/PublishInTheFuture.php index e18130cf..8afa599d 100644 --- a/src/lib/Subscriber/PublishInTheFuture.php +++ b/src/lib/Subscriber/PublishInTheFuture.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; -use EzSystems\DateBasedPublisher\API\Repository\DateBasedPublishServiceInterface; +use Ibexa\Contracts\Scheduler\Repository\DateBasedPublishServiceInterface; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -21,7 +21,7 @@ class PublishInTheFuture extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \EzSystems\DateBasedPublisher\API\Repository\DateBasedPublishServiceInterface */ + /** @var \Ibexa\Contracts\Scheduler\Repository\DateBasedPublishServiceInterface */ private $dateBasedPublisherService; /** @var \Ibexa\Workflow\Behat\Facade\WorkflowFacade */ diff --git a/src/lib/Subscriber/Review.php b/src/lib/Subscriber/Review.php index 2f212178..fcfd1155 100644 --- a/src/lib/Subscriber/Review.php +++ b/src/lib/Subscriber/Review.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\Subscriber; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\ContentDataProvider; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; @@ -25,7 +25,7 @@ class Review extends AbstractProcessStage implements EventSubscriberInterface /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ private $contentDataProvider; - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; /** @var \Ibexa\Workflow\Behat\Facade\WorkflowFacade */ diff --git a/tests/Browser/Filter/BrowserLogFilterTest.php b/tests/Browser/Filter/BrowserLogFilterTest.php index 1f9952f0..dbdd57dd 100644 --- a/tests/Browser/Filter/BrowserLogFilterTest.php +++ b/tests/Browser/Filter/BrowserLogFilterTest.php @@ -21,8 +21,8 @@ class BrowserLogFilterTest extends TestCase public function testFiltersOutExcludedPatterns() { $initialLogEntries = [ - 'http://web/api/ezp/v2/bookmark/43 - Failed to load resource: the server responded with a status of 404 (Not Found)', - 'https://varnish/api/ezp/v2/bookmark/1 - Failed to load resource: the server responded with a status of 404 (Not Found)', + 'http://web/api/ibexa/v2/bookmark/43 - Failed to load resource: the server responded with a status of 404 (Not Found)', + 'https://varnish/api/ibexa/v2/bookmark/1 - Failed to load resource: the server responded with a status of 404 (Not Found)', 'Real JS Error', 'http://varnish/bundles/netgentags/admin/jstree/js/jstree.min.js 5 document.registerElement is deprecated and will be removed in M73, around March 2019. Please use window.customElements.define instead. See https://www.chromestatus.com/features/4642138092470272 for more details.', 'https://web/bundles/netgentags/admin/jstree/js/jstree.min.js 5 document.registerElement is deprecated and will be removed in M73, around March 2019. Please use window.customElements.define instead. See https://www.chromestatus.com/features/4642138092470272 for more details.', diff --git a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php b/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php index f44b5d99..2cc14c75 100644 --- a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php +++ b/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php @@ -8,7 +8,7 @@ namespace EzSystems\Behat\Test\Core\Configuration; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Core\Repository\Values\Content\Location; use EzSystems\Behat\API\Facade\ContentFacade; use EzSystems\Behat\Core\Configuration\ConfigurationEditor; use EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor; From 228999378a98e7025752fe47e792d08232673fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 28 Jan 2022 16:20:14 +0100 Subject: [PATCH 21/85] Fixed CS --- .php-cs-fixer.cache | 1 + .php-cs-fixer.php | 23 ++++++++++++++ .php_cs | 9 ------ composer.json | 4 +-- .../Command/CreateExampleDataCommand.php | 2 +- .../CreateExampleDataManagerCommand.php | 2 +- .../Command/GetPullRequestDataCommand.php | 17 +++++++---- .../Controller/CurrentUserDataController.php | 1 + .../API/ContentData/ContentDataProvider.php | 2 +- .../FieldTypeData/BooleanDataProvider.php | 2 +- .../FieldTypeData/ImageAssetDataProvider.php | 7 +++-- .../FieldTypeData/ImageDataProvider.php | 2 +- .../FieldTypeData/MatrixDataProvider.php | 3 +- .../ObjectRelationDataProvider.php | 5 ++-- .../API/ContentData/RandomDataGenerator.php | 2 +- src/lib/API/Context/ContentTypeContext.php | 2 +- .../ContentTypeLimitationParser.php | 1 + .../LocationLimitationParser.php | 4 ++- .../SubtreeLimitationParser.php | 1 + src/lib/API/Context/TestContext.php | 1 + src/lib/API/Facade/ContentFacade.php | 4 +-- src/lib/API/Facade/ContentTypeFacade.php | 4 +-- src/lib/API/Facade/RoleFacade.php | 2 +- src/lib/API/Facade/SearchFacade.php | 1 + src/lib/API/Facade/UserFacade.php | 5 ++-- src/lib/Browser/Assert/CollectionAssert.php | 10 +++---- src/lib/Browser/Assert/ElementAssert.php | 4 ++- .../Browser/Context/AuthenticationContext.php | 1 + .../Debug/Highlighting/BaseElement.php | 6 ++-- src/lib/Browser/Element/ElementCollection.php | 1 + .../Browser/FileUpload/FileUploadHelper.php | 1 + src/lib/Browser/Routing/Router.php | 2 +- src/lib/Core/Context/ConfigurationContext.php | 4 +++ src/lib/Core/Context/FileContext.php | 1 + src/lib/Subscriber/AbstractProcessStage.php | 6 ++-- src/lib/Subscriber/CreateContentDraft.php | 4 +-- src/lib/Subscriber/EditContent.php | 6 ++-- src/lib/Subscriber/InitialStage.php | 4 +-- src/lib/Subscriber/PublishDraft.php | 6 ++-- src/lib/Subscriber/PublishInTheFuture.php | 4 +-- src/lib/Subscriber/Review.php | 6 ++-- ...ElementTransitionHasEndedConditionTest.php | 3 +- .../Criterion/LogicalOrCriterionTest.php | 3 +- .../Browser/Element/ElementCollectionTest.php | 30 ++++++++++++++----- .../LocationAwareConfigurationEditorTest.php | 2 +- 45 files changed, 135 insertions(+), 76 deletions(-) create mode 100644 .php-cs-fixer.cache create mode 100644 .php-cs-fixer.php delete mode 100644 .php_cs diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache new file mode 100644 index 00000000..ddede05f --- /dev/null +++ b/.php-cs-fixer.cache @@ -0,0 +1 @@ +{"php":"7.4.26","version":"3.4.0:v3.4.0#47177af1cfb9dab5d1cc4daf91b7179c2efe7fad","indent":" ","lineEnding":"\n","rules":{"declare_strict_types":true,"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"constant_case":{"case":"lower"},"lowercase_keywords":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_closure":true},"class_attributes_separation":{"elements":{"method":"one","property":"one"}},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"method_argument_space":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_indent":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_tag_type":{"tags":{"inheritdoc":"inline"}},"general_phpdoc_tag_rename":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":{"replacements":{"type":"var","link":"see"}},"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"single_trait_insert_per_statement":true,"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"dir_constant":true,"ereg_to_preg":true,"error_suppression":true,"fopen_flag_order":true,"function_to_constant":true,"implode_call":true,"is_null":true,"modernize_types_casting":true,"native_constant_invocation":{"fix_built_in":false,"include":["DIRECTORY_SEPARATOR","PHP_SAPI","PHP_VERSION_ID"],"scope":"namespaced"},"no_alias_functions":true,"no_homoglyph_names":true,"non_printable_character":true,"php_unit_construct":true,"psr_autoloading":true,"set_type_to_cast":true,"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"},"single_blank_line_before_namespace":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"static_lambda":true,"ordered_imports":true,"header_comment":{"comment_type":"PHPDoc","header":"@copyright Copyright (C) Ibexa AS. All rights reserved.\n@license For full copyright and license information view LICENSE file distributed with this source code.","location":"after_open","separate":"top"},"AdamWojs\/phpdoc_force_fqcn_fixer":true},"hashes":{"src\/bundle\/Initializer\/BehatSiteAccessInitializer.php":2002336590,"src\/bundle\/EzSystemsBehatBundle.php":1750058674,"src\/bundle\/Templating\/Twig\/PHPTypeExtension.php":1719429617,"src\/bundle\/Controller\/ExceptionController.php":47193292,"src\/bundle\/Controller\/CurrentUserDataController.php":3584893852,"src\/bundle\/Controller\/UnauthenticatedRedirectController.php":2729694909,"src\/bundle\/Controller\/RenderController.php":3656776178,"src\/bundle\/BehatExtension.php":3194639878,"src\/bundle\/Command\/CreateExampleDataCommand.php":3037181105,"src\/bundle\/Command\/GetPullRequestDataCommand.php":634814666,"src\/bundle\/Command\/TestSiteaccessCommand.php":1473619159,"src\/bundle\/Command\/CreateExampleDataManagerCommand.php":1638312727,"src\/bundle\/Command\/CreateLanguageCommand.php":2957742906,"src\/bundle\/DependencyInjection\/eZBehatExtension.php":3422631746,"src\/bundle\/DependencyInjection\/Compiler\/FieldTypeDataProviderPass.php":3311607453,"src\/bundle\/DependencyInjection\/Compiler\/ElementFactoryCompilerPass.php":1399154019,"src\/bundle\/DependencyInjection\/Compiler\/LimitationParserPass.php":2181155052,"src\/lib\/QueryType\/FoldersUnderMediaQueryType.php":1648646101,"src\/lib\/Core\/Configuration\/ConfigurationEditorInterface.php":4040658939,"src\/lib\/Core\/Configuration\/LocationAwareConfigurationEditor.php":4255400751,"src\/lib\/Core\/Configuration\/ConfigurationEditor.php":738574370,"src\/lib\/Core\/Context\/TimeContext.php":300402635,"src\/lib\/Core\/Context\/FileContext.php":807873755,"src\/lib\/Core\/Context\/ConfigurationContext.php":3032088253,"src\/lib\/Core\/Behat\/TableNodeExtension.php":3592141403,"src\/lib\/Core\/Behat\/ArgumentParser.php":1312792765,"src\/lib\/Core\/Log\/LogFileReader.php":1889300066,"src\/lib\/Core\/Log\/TestLogProvider.php":2488327747,"src\/lib\/Core\/Debug\/InteractiveDebuggerTrait.php":4044840925,"src\/lib\/Core\/Debug\/Shell\/Shell.php":3224187909,"src\/lib\/Core\/Debug\/Matcher\/ObjectFunctionCallChainMatcher.php":3340165448,"src\/lib\/Core\/Debug\/Matcher\/ThisObjectMethodsMatcher.php":3968836347,"src\/lib\/Core\/Debug\/Command\/ShowURLCommand.php":483544228,"src\/lib\/Core\/Debug\/Command\/GoBackCommand.php":2844465322,"src\/lib\/Core\/Debug\/Command\/RefreshPageCommand.php":3215648951,"src\/lib\/Core\/Debug\/Command\/TakeScreenshotCommand.php":3952416661,"src\/lib\/Core\/Debug\/Command\/ShowHTMLCommand.php":2322737389,"src\/lib\/Browser\/FileUpload\/FileUploadHelper.php":1293416823,"src\/lib\/Browser\/Page\/LoginPage.php":2709919473,"src\/lib\/Browser\/Page\/PageInterface.php":2665739008,"src\/lib\/Browser\/Page\/Preview\/PagePreviewRegistry.php":2471758927,"src\/lib\/Browser\/Page\/Preview\/PagePreviewInterface.php":1426235086,"src\/lib\/Browser\/Page\/Preview\/FolderPreview.php":1989903023,"src\/lib\/Browser\/Page\/Page.php":1616087642,"src\/lib\/Browser\/Page\/PageRegistry.php":1216761387,"src\/lib\/Browser\/Page\/RedirectLoginPage.php":1677871096,"src\/lib\/Browser\/Locator\/VisibleCSSLocator.php":4019040745,"src\/lib\/Browser\/Locator\/LocatorInterface.php":2371848562,"src\/lib\/Browser\/Locator\/CSSLocator.php":2105213558,"src\/lib\/Browser\/Locator\/XPathLocator.php":3847724366,"src\/lib\/Browser\/Locator\/CSSLocatorBuilder.php":3391184374,"src\/lib\/Browser\/Locator\/LocatorCollection.php":2115061589,"src\/lib\/Browser\/Locator\/BaseLocator.php":1245303114,"src\/lib\/Browser\/Context\/DebuggingContext.php":1079762865,"src\/lib\/Browser\/Context\/ContentPreviewContext.php":924454052,"src\/lib\/Browser\/Context\/BrowserContext.php":757795377,"src\/lib\/Browser\/Context\/AuthenticationContext.php":2548858477,"src\/lib\/Browser\/Element\/Element.php":2434313350,"src\/lib\/Browser\/Element\/ElementCollectionInterface.php":2822900023,"src\/lib\/Browser\/Element\/Mapper\/MapperInterface.php":4144650502,"src\/lib\/Browser\/Element\/Mapper\/ElementTextMapper.php":2499502488,"src\/lib\/Browser\/Element\/ElementCollection.php":713656180,"src\/lib\/Browser\/Element\/Criterion\/ChildElementTextCriterion.php":3062133723,"src\/lib\/Browser\/Element\/Criterion\/ElementTextCriterion.php":4047513666,"src\/lib\/Browser\/Element\/Criterion\/ElementTextFragmentCriterion.php":1184441132,"src\/lib\/Browser\/Element\/Criterion\/ElementAttributeCriterion.php":340054511,"src\/lib\/Browser\/Element\/Criterion\/CriterionInterface.php":3976097957,"src\/lib\/Browser\/Element\/Criterion\/LogicalOrCriterion.php":2767455630,"src\/lib\/Browser\/Element\/RootElementInterface.php":385602756,"src\/lib\/Browser\/Element\/BaseElement.php":2564347928,"src\/lib\/Browser\/Element\/Condition\/ElementExistsCondition.php":2854511430,"src\/lib\/Browser\/Element\/Condition\/ElementsCountCondition.php":1741184555,"src\/lib\/Browser\/Element\/Condition\/ConditionInterface.php":2413694900,"src\/lib\/Browser\/Element\/Condition\/ElementNotExistsCondition.php":2483630598,"src\/lib\/Browser\/Element\/Condition\/ElementTransitionHasEndedCondition.php":4013234557,"src\/lib\/Browser\/Element\/Condition\/ElementsCountGreaterThanCondition.php":4195681639,"src\/lib\/Browser\/Element\/ElementInterface.php":557654181,"src\/lib\/Browser\/Element\/BaseElementInterface.php":230996551,"src\/lib\/Browser\/Element\/Factory\/ElementFactory.php":666013110,"src\/lib\/Browser\/Element\/Factory\/ElementFactoryInterface.php":644819173,"src\/lib\/Browser\/Element\/Factory\/Debug\/Highlighting\/ElementFactory.php":4200527132,"src\/lib\/Browser\/Element\/Factory\/Debug\/Interactive\/ElementFactory.php":3493657266,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/Element.php":4017539156,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/BaseElement.php":2935381397,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/RootElement.php":436863522,"src\/lib\/Browser\/Element\/Debug\/Interactive\/Element.php":1862890452,"src\/lib\/Browser\/Element\/Debug\/Interactive\/ElementCollection.php":2166825888,"src\/lib\/Browser\/Element\/Debug\/Interactive\/BaseElement.php":1748443230,"src\/lib\/Browser\/Element\/Debug\/Interactive\/RootElement.php":2228655536,"src\/lib\/Browser\/Element\/RootElement.php":349503287,"src\/lib\/Browser\/Component\/ComponentInterface.php":3521196349,"src\/lib\/Browser\/Component\/Component.php":1789343111,"src\/lib\/Browser\/Assert\/CollectionAssert.php":3046912180,"src\/lib\/Browser\/Assert\/ElementAssertInterface.php":401047847,"src\/lib\/Browser\/Assert\/ElementAssert.php":1124163405,"src\/lib\/Browser\/Assert\/CollectionAssertInterface.php":2133910095,"src\/lib\/Browser\/Assert\/Debug\/Interactive\/CollectionAssert.php":747802423,"src\/lib\/Browser\/Assert\/Debug\/Interactive\/ElementAssert.php":2819319489,"src\/lib\/Browser\/Environment\/ParameterProvider.php":223848782,"src\/lib\/Browser\/Environment\/ParameterProviderInterface.php":2307291194,"src\/lib\/Browser\/Routing\/Router.php":2872789444,"src\/lib\/Browser\/Filter\/BrowserLogFilter.php":2424768828,"src\/lib\/Browser\/Exception\/ElementNotFoundException.php":2666902227,"src\/lib\/Browser\/Exception\/TimeoutException.php":2293766227,"src\/lib\/API\/Context\/ObjectStateContext.php":2183391778,"src\/lib\/API\/Context\/UserContext.php":3733576626,"src\/lib\/API\/Context\/LimitationParser\/UserGroupLimitationParser.php":1066481485,"src\/lib\/API\/Context\/LimitationParser\/OwnerLimitationParser.php":2703336235,"src\/lib\/API\/Context\/LimitationParser\/NewSectionLimitationParser.php":3661768215,"src\/lib\/API\/Context\/LimitationParser\/ContentTypeLimitationParser.php":1026609545,"src\/lib\/API\/Context\/LimitationParser\/WorkflowStageLimitationParser.php":1834933158,"src\/lib\/API\/Context\/LimitationParser\/SubtreeLimitationParser.php":1106984934,"src\/lib\/API\/Context\/LimitationParser\/ObjectStateLimitationParser.php":1538053547,"src\/lib\/API\/Context\/LimitationParser\/LocationLimitationParser.php":1245963752,"src\/lib\/API\/Context\/LimitationParser\/LimitationParserInterface.php":1780196646,"src\/lib\/API\/Context\/LimitationParser\/ParentUserGroupLimitationParser.php":963684769,"src\/lib\/API\/Context\/LimitationParser\/ParentDepthLimitationParser.php":2828645753,"src\/lib\/API\/Context\/LimitationParser\/LimitationParsersCollector.php":1344643828,"src\/lib\/API\/Context\/LimitationParser\/LanguageLimitationParser.php":1325184452,"src\/lib\/API\/Context\/LimitationParser\/SectionLimitationParser.php":146899611,"src\/lib\/API\/Context\/LimitationParser\/FieldGroupLimitationParser.php":2198269172,"src\/lib\/API\/Context\/LimitationParser\/ParentContentTypeLimitationParser.php":98243061,"src\/lib\/API\/Context\/LimitationParser\/NewStateLimitationParser.php":128910333,"src\/lib\/API\/Context\/LimitationParser\/WorkflowTransitionLimitationParser.php":193852603,"src\/lib\/API\/Context\/LimitationParser\/ParentOwnerLimitationParser.php":4271097045,"src\/lib\/API\/Context\/LimitationParser\/SiteaccessLimitationParser.php":2370355137,"src\/lib\/API\/Context\/TrashContext.php":1996592746,"src\/lib\/API\/Context\/ContentContext.php":3913656482,"src\/lib\/API\/Context\/RoleContext.php":3820011330,"src\/lib\/API\/Context\/ContentTypeContext.php":891812060,"src\/lib\/API\/Context\/TestContext.php":1139172158,"src\/lib\/API\/Context\/LanguageContext.php":627930056,"src\/lib\/API\/Facade\/ContentTypeFacade.php":3633372326,"src\/lib\/API\/Facade\/ContentFacade.php":361900150,"src\/lib\/API\/Facade\/LanguageFacade.php":781624730,"src\/lib\/API\/Facade\/UserFacade.php":705465834,"src\/lib\/API\/Facade\/RoleFacade.php":533208065,"src\/lib\/API\/Facade\/SearchFacade.php":604668046,"src\/lib\/API\/Facade\/TrashFacade.php":3408689723,"src\/lib\/API\/ContentData\/FieldTypeNameConverter.php":1352287092,"src\/lib\/API\/ContentData\/ContentDataProvider.php":3837841561,"src\/lib\/API\/ContentData\/RandomDataGenerator.php":3297474066,"src\/lib\/API\/ContentData\/FieldTypeData\/MatrixDataProvider.php":106436603,"src\/lib\/API\/ContentData\/FieldTypeData\/AbstractFieldTypeDataProvider.php":3295563291,"src\/lib\/API\/ContentData\/FieldTypeData\/FloatDataProvider.php":4190052315,"src\/lib\/API\/ContentData\/FieldTypeData\/ISBNDataProvider.php":272658087,"src\/lib\/API\/ContentData\/FieldTypeData\/TimeDataProvider.php":2716617817,"src\/lib\/API\/ContentData\/FieldTypeData\/PasswordProvider.php":840867617,"src\/lib\/API\/ContentData\/FieldTypeData\/ImageDataProvider.php":394174470,"src\/lib\/API\/ContentData\/FieldTypeData\/FieldTypeDataProviderInterface.php":360673926,"src\/lib\/API\/ContentData\/FieldTypeData\/BinaryFileDataProvider.php":484676700,"src\/lib\/API\/ContentData\/FieldTypeData\/MapDataProvider.php":2717426481,"src\/lib\/API\/ContentData\/FieldTypeData\/CountryDataProvider.php":820872488,"src\/lib\/API\/ContentData\/FieldTypeData\/SelectionDataProvider.php":3517179834,"src\/lib\/API\/ContentData\/FieldTypeData\/EmailDataProvider.php":1414249414,"src\/lib\/API\/ContentData\/FieldTypeData\/ObjectRelationListDataProvider.php":2483669224,"src\/lib\/API\/ContentData\/FieldTypeData\/TextBlockDataProvider.php":3929720822,"src\/lib\/API\/ContentData\/FieldTypeData\/URLDataProvider.php":2319997268,"src\/lib\/API\/ContentData\/FieldTypeData\/ImageAssetDataProvider.php":2770186402,"src\/lib\/API\/ContentData\/FieldTypeData\/ObjectRelationDataProvider.php":527593256,"src\/lib\/API\/ContentData\/FieldTypeData\/MediaDataProvider.php":4176591271,"src\/lib\/API\/ContentData\/FieldTypeData\/RichTextDataProvider.php":3934619597,"src\/lib\/API\/ContentData\/FieldTypeData\/AuthorDataProvider.php":1887480567,"src\/lib\/API\/ContentData\/FieldTypeData\/DateTimeDataProvider.php":96735861,"src\/lib\/API\/ContentData\/FieldTypeData\/DateDataProvider.php":658117359,"src\/lib\/API\/ContentData\/FieldTypeData\/IntegerDataProvider.php":2203955373,"src\/lib\/API\/ContentData\/FieldTypeData\/TextLineDataProvider.php":3045648384,"src\/lib\/API\/ContentData\/FieldTypeData\/BooleanDataProvider.php":59550666,"src\/lib\/Subscriber\/Review.php":3926541404,"src\/lib\/Subscriber\/InitialStage.php":1811547087,"src\/lib\/Subscriber\/AbstractProcessStage.php":733457492,"src\/lib\/Subscriber\/EditContent.php":2465788301,"src\/lib\/Subscriber\/PublishDraft.php":519997205,"src\/lib\/Subscriber\/PublishInTheFuture.php":763112845,"src\/lib\/Subscriber\/CreateContentDraft.php":103767890,"src\/lib\/Event\/TransitionEvent.php":1709766547,"src\/lib\/Event\/Events.php":4152054631,"src\/lib\/Event\/InitialEvent.php":1472655618,"tests\/Core\/Configuration\/ConfigurationEditorTest.php":2819445536,"tests\/Core\/Configuration\/LocationAwareConfigurationEditorTest.php":3911310500,"tests\/Core\/Behat\/ArgumentParserTest.php":1943793396,"tests\/Core\/Behat\/ExtendedTableNodeTest.php":506854644,"tests\/Core\/Log\/LogFileReaderTest.php":790354740,"tests\/Browser\/Element\/ElementCollectionTest.php":4274548719,"tests\/Browser\/Element\/Mapper\/TextMapperTestCase.php":2206716554,"tests\/Browser\/Element\/ElementTest.php":756097771,"tests\/Browser\/Element\/Criterion\/ElementTextCriterionTest.php":200430177,"tests\/Browser\/Element\/Criterion\/ElementTextFragmentCriterionTest.php":792906412,"tests\/Browser\/Element\/Criterion\/LogicalOrCriterionTest.php":4058057091,"tests\/Browser\/Element\/Criterion\/ChildElementTextCriterionTest.php":2112186072,"tests\/Browser\/Element\/Criterion\/ElementAttributeCriterionTest.php":928144501,"tests\/Browser\/Element\/Condition\/ElementTransitionHasEndedConditionTest.php":3950354378,"tests\/Browser\/Element\/Condition\/ElementNotExistsConditionTest.php":3633606218,"tests\/Browser\/Element\/Condition\/ElementsCountConditionTest.php":729497062,"tests\/Browser\/Element\/Condition\/ElementExistsConditionTest.php":3702524597,"tests\/Browser\/Element\/Condition\/ElementsCountGreaterThanConditionTest.php":315385727,"tests\/Browser\/Element\/BaseTestCase.php":3490112019,"tests\/Browser\/Element\/Debug\/HighlightingElementTest.php":1851245414,"tests\/Browser\/Element\/Debug\/Assert\/Interactive\/CollectionAssertTest.php":105472978,"tests\/Browser\/Element\/Debug\/Assert\/Interactive\/ElementAssertTest.php":2575945190,"tests\/Browser\/Element\/Debug\/InteractiveElementTest.php":2544046762,"tests\/Browser\/Filter\/BrowserLogFilterTest.php":1140802726}} \ No newline at end of file diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 00000000..cacf74b2 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,23 @@ + +buildConfig() + ->setFinder( + PhpCsFixer\Finder::create() + ->in( + array_filter([ + __DIR__ . '/src', + __DIR__ . '/tests', + ], 'is_dir') + ) + ->files()->name('*.php') + ); diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 4115d463..00000000 --- a/.php_cs +++ /dev/null @@ -1,9 +0,0 @@ -setFinder( - PhpCsFixer\Finder::create() - ->in([__DIR__ . '/src', __DIR__ . '/tests']) - ->files()->name('*.php') - ) -; diff --git a/composer.json b/composer.json index 35df3378..dd8bc3b0 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ }, "require-dev": { "ibexa/code-style": "^1.0", - "friendsofphp/php-cs-fixer": "^2.16.0", + "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", "ibexa/doctrine-schema": "^4.0@dev", "ibexa/rest": "^4.0@dev", @@ -63,7 +63,7 @@ } }, "scripts": { - "fix-cs": "php-cs-fixer fix -v --show-progress=estimating", + "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots", "check-cs": "@fix-cs --dry-run", "test": "phpunit -c phpunit.xml" }, diff --git a/src/bundle/Command/CreateExampleDataCommand.php b/src/bundle/Command/CreateExampleDataCommand.php index 8a00650d..653a1152 100644 --- a/src/bundle/Command/CreateExampleDataCommand.php +++ b/src/bundle/Command/CreateExampleDataCommand.php @@ -8,9 +8,9 @@ namespace EzSystems\BehatBundle\Command; -use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\InitialEvent; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use Symfony\Component\Console\Command\Command; diff --git a/src/bundle/Command/CreateExampleDataManagerCommand.php b/src/bundle/Command/CreateExampleDataManagerCommand.php index 184fa7b2..10e797a4 100644 --- a/src/bundle/Command/CreateExampleDataManagerCommand.php +++ b/src/bundle/Command/CreateExampleDataManagerCommand.php @@ -8,8 +8,8 @@ namespace EzSystems\BehatBundle\Command; -use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use EzSystems\Behat\Event\InitialEvent; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\ConsoleOutputInterface; diff --git a/src/bundle/Command/GetPullRequestDataCommand.php b/src/bundle/Command/GetPullRequestDataCommand.php index 21358a97..7ee53bef 100644 --- a/src/bundle/Command/GetPullRequestDataCommand.php +++ b/src/bundle/Command/GetPullRequestDataCommand.php @@ -8,11 +8,11 @@ namespace EzSystems\BehatBundle\Command; -use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use GuzzleHttp\Psr7\Request; use Http\Client\Common\HttpMethodsClient; use Http\Discovery\HttpClientDiscovery; use Http\Discovery\MessageFactoryDiscovery; +use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Psr\Http\Message\ResponseInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -47,11 +47,13 @@ protected function configure() ->addArgument( 'pull-request-url', InputArgument::REQUIRED, - 'GitHub Pull Request URL') + 'GitHub Pull Request URL' + ) ->addArgument( 'token', InputArgument::OPTIONAL, - 'GitHub OAuth token') + 'GitHub OAuth token' + ) ->setHelp("This command outputs data in given order: - repository URL - name of the branch used in PR @@ -83,7 +85,8 @@ public function execute(InputInterface $input, OutputInterface $output) $branchAlias = $composerExtraData['branchAlias']; $pageBuilderBranch = $this->getPageBuilderBranchName($metarepositoryBranch); - $outputString = sprintf('%s %s %s %s %s %s', + $outputString = sprintf( + '%s %s %s %s %s %s', $repositoryURL, $branchName, $branchAlias, @@ -177,9 +180,11 @@ private function sendRequest(string $requestUrl, string $acceptFormat): Response if ($response->getStatusCode() !== 200) { throw new \Exception( - sprintf('GitHub API returned code %d, expected 200. Reason: %s', + sprintf( + 'GitHub API returned code %d, expected 200. Reason: %s', $response->getStatusCode(), - $response->getReasonPhrase()) + $response->getReasonPhrase() + ) ); } diff --git a/src/bundle/Controller/CurrentUserDataController.php b/src/bundle/Controller/CurrentUserDataController.php index bc3ba751..2131bd67 100644 --- a/src/bundle/Controller/CurrentUserDataController.php +++ b/src/bundle/Controller/CurrentUserDataController.php @@ -20,6 +20,7 @@ class CurrentUserDataController extends AbstractController * @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; + /** * @var \Ibexa\Contracts\Core\Repository\UserService */ diff --git a/src/lib/API/ContentData/ContentDataProvider.php b/src/lib/API/ContentData/ContentDataProvider.php index 7fba3e15..68ac5690 100644 --- a/src/lib/API/ContentData/ContentDataProvider.php +++ b/src/lib/API/ContentData/ContentDataProvider.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\API\ContentData; +use EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct; use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct; use Ibexa\Contracts\Core\Repository\Values\Content\ContentUpdateStruct; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; -use EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; class ContentDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php index dc085145..7946c891 100644 --- a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use Ibexa\Contracts\Core\Repository\ContentTypeService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Contracts\Core\Repository\ContentTypeService; class BooleanDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php index 178cfacc..e813b11e 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; +use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use EzSystems\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Core\FieldType\ImageAsset\AssetMapper; use Ibexa\Core\FieldType\ImageAsset\Value; use Ibexa\Core\MVC\ConfigResolverInterface; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Core\Behat\ArgumentParser; class ImageAssetDataProvider extends AbstractFieldTypeDataProvider { @@ -22,6 +22,7 @@ class ImageAssetDataProvider extends AbstractFieldTypeDataProvider * @var \Ibexa\Core\FieldType\ImageAsset\AssetMapper */ private $assetMapper; + /** * @var ImageDataProvider */ @@ -31,10 +32,12 @@ class ImageAssetDataProvider extends AbstractFieldTypeDataProvider * @var \EzSystems\Behat\Core\Behat\ArgumentParser */ private $argumentParser; + /** * @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; + /** * @var \Ibexa\Contracts\Core\Repository\URLAliasService */ diff --git a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php index 826c1569..e9b37dae 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php @@ -8,8 +8,8 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use Ibexa\Core\FieldType\Image\Value; use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Core\FieldType\Image\Value; class ImageDataProvider extends AbstractFieldTypeDataProvider { diff --git a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php index 707b378a..a075cbb2 100644 --- a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php @@ -8,14 +8,15 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; -use Ibexa\Contracts\Core\Repository\ContentTypeService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\FieldTypeMatrix\FieldType\Value; use Ibexa\FieldTypeMatrix\FieldType\Value\Row; class MatrixDataProvider extends AbstractFieldTypeDataProvider { private const MAX_NUMBER_OF_ITEMS = 200; + private $contentTypeService; public function __construct(RandomDataGenerator $randomDataGenerator, ContentTypeService $contentTypeService) diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php index 84543d5f..5fb2c56a 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php @@ -8,17 +8,18 @@ namespace EzSystems\Behat\API\ContentData\FieldTypeData; +use EzSystems\Behat\API\Facade\SearchFacade; +use EzSystems\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Core\FieldType\Relation\Value; -use EzSystems\Behat\API\Facade\SearchFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; class ObjectRelationDataProvider implements FieldTypeDataProviderInterface { /** @var \EzSystems\Behat\API\Facade\SearchFacade */ protected $searchFacade; + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; diff --git a/src/lib/API/ContentData/RandomDataGenerator.php b/src/lib/API/ContentData/RandomDataGenerator.php index cbda499b..3fd073a5 100644 --- a/src/lib/API/ContentData/RandomDataGenerator.php +++ b/src/lib/API/ContentData/RandomDataGenerator.php @@ -9,9 +9,9 @@ namespace EzSystems\Behat\API\ContentData; use DateTime; -use Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface; use Faker; use Faker\Generator; +use Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface; class RandomDataGenerator { diff --git a/src/lib/API/Context/ContentTypeContext.php b/src/lib/API/Context/ContentTypeContext.php index 19b26e69..86f12d14 100644 --- a/src/lib/API/Context/ContentTypeContext.php +++ b/src/lib/API/Context/ContentTypeContext.php @@ -10,8 +10,8 @@ use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; use EzSystems\Behat\API\Facade\ContentTypeFacade; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; class ContentTypeContext implements Context { diff --git a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php index 7f38d210..5b353e62 100644 --- a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php @@ -15,6 +15,7 @@ class ContentTypeLimitationParser implements LimitationParserInterface { private $contentTypService; + private $contentTypeNameIdentifierMap; public function __construct(ContentTypeService $contentTypeService) diff --git a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php index 5dc0b115..1a76da7f 100644 --- a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php @@ -8,17 +8,19 @@ namespace EzSystems\Behat\API\Context\LimitationParser; +use EzSystems\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation; -use EzSystems\Behat\Core\Behat\ArgumentParser; class LocationLimitationParser implements LimitationParserInterface { private $locationService; + private $urlAliasService; + private $argumentParser; public function __construct(URLAliasService $urlAliasService, LocationService $locationService, ArgumentParser $argumentParser) diff --git a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php index 40f5855e..3df3cb39 100644 --- a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php @@ -16,6 +16,7 @@ class SubtreeLimitationParser implements LimitationParserInterface { private $locationService; + private $urlAliasService; public function __construct(URLAliasService $urlAliasService, LocationService $locationService) diff --git a/src/lib/API/Context/TestContext.php b/src/lib/API/Context/TestContext.php index 036cd4c0..33d1e78e 100644 --- a/src/lib/API/Context/TestContext.php +++ b/src/lib/API/Context/TestContext.php @@ -16,6 +16,7 @@ class TestContext implements Context { private $permissionResolver; + private $userService; public function __construct(UserService $userService, PermissionResolver $permissionResolver) diff --git a/src/lib/API/Facade/ContentFacade.php b/src/lib/API/Facade/ContentFacade.php index 50671bba..f7ea6278 100644 --- a/src/lib/API/Facade/ContentFacade.php +++ b/src/lib/API/Facade/ContentFacade.php @@ -8,6 +8,8 @@ namespace EzSystems\Behat\API\Facade; +use EzSystems\Behat\API\ContentData\ContentDataProvider; +use FOS\HttpCacheBundle\CacheManager; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\Repository; @@ -15,8 +17,6 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; -use EzSystems\Behat\API\ContentData\ContentDataProvider; -use FOS\HttpCacheBundle\CacheManager; use PHPUnit\Framework\Assert; class ContentFacade diff --git a/src/lib/API/Facade/ContentTypeFacade.php b/src/lib/API/Facade/ContentTypeFacade.php index 4405e679..72c40493 100644 --- a/src/lib/API/Facade/ContentTypeFacade.php +++ b/src/lib/API/Facade/ContentTypeFacade.php @@ -8,11 +8,11 @@ namespace EzSystems\Behat\API\Facade; +use EzSystems\Behat\API\ContentData\FieldTypeNameConverter; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; -use EzSystems\Behat\API\ContentData\FieldTypeNameConverter; use Ibexa\Core\Persistence\Cache\Identifier\CacheIdentifierGeneratorInterface; use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface; @@ -35,7 +35,7 @@ public function __construct( ContentTypeService $contentTypeService, TagAwareAdapterInterface $cachePool, CacheIdentifierGeneratorInterface $cacheIdentifierGenerator - ) { + ) { $this->contentTypeService = $contentTypeService; $this->cachePool = $cachePool; $this->cacheIdentifierGenerator = $cacheIdentifierGenerator; diff --git a/src/lib/API/Facade/RoleFacade.php b/src/lib/API/Facade/RoleFacade.php index c9bf3d8c..31684368 100644 --- a/src/lib/API/Facade/RoleFacade.php +++ b/src/lib/API/Facade/RoleFacade.php @@ -8,9 +8,9 @@ namespace EzSystems\Behat\API\Facade; +use EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\RoleService; -use EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector; class RoleFacade { diff --git a/src/lib/API/Facade/SearchFacade.php b/src/lib/API/Facade/SearchFacade.php index 6fbd5e5a..541ada15 100644 --- a/src/lib/API/Facade/SearchFacade.php +++ b/src/lib/API/Facade/SearchFacade.php @@ -31,6 +31,7 @@ class SearchFacade /** @var \Ibexa\Contracts\Core\Repository\SearchService */ private $searchService; + /** * @var \Ibexa\Contracts\Core\Repository\ContentService */ diff --git a/src/lib/API/Facade/UserFacade.php b/src/lib/API/Facade/UserFacade.php index 1a1f65ba..98167f9e 100644 --- a/src/lib/API/Facade/UserFacade.php +++ b/src/lib/API/Facade/UserFacade.php @@ -8,6 +8,8 @@ namespace EzSystems\Behat\API\Facade; +use EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider; +use EzSystems\Behat\API\ContentData\RandomDataGenerator; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\SearchService; @@ -17,14 +19,13 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; use Ibexa\Contracts\Core\Repository\Values\User\UserGroup; use Ibexa\Core\Base\Exceptions\NotFoundException; -use EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; class UserFacade { public const USER_CONTENT_TYPE_IDENTIFIER = 'user'; public const USERGROUP_CONTENT_IDENTIFIER = 'user_group'; public const ROOT_USERGROUP_CONTENT_ID = 4; + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; diff --git a/src/lib/Browser/Assert/CollectionAssert.php b/src/lib/Browser/Assert/CollectionAssert.php index 9279f5f5..439176cb 100644 --- a/src/lib/Browser/Assert/CollectionAssert.php +++ b/src/lib/Browser/Assert/CollectionAssert.php @@ -35,11 +35,11 @@ public function isEmpty(): ElementCollectionInterface Assert::assertTrue( $this->elementCollection->empty(), sprintf( - "Failed asserting that Collection created with %s locator '%s': '%s' is empty", - $this->locator->getType(), - $this->locator->getIdentifier(), - $this->locator->getSelector() - ) + "Failed asserting that Collection created with %s locator '%s': '%s' is empty", + $this->locator->getType(), + $this->locator->getIdentifier(), + $this->locator->getSelector() + ) ); return $this->elementCollection; diff --git a/src/lib/Browser/Assert/ElementAssert.php b/src/lib/Browser/Assert/ElementAssert.php index 37a3ecd1..a133212a 100644 --- a/src/lib/Browser/Assert/ElementAssert.php +++ b/src/lib/Browser/Assert/ElementAssert.php @@ -18,6 +18,7 @@ class ElementAssert implements ElementAssertInterface * @var \Ibexa\Behat\Browser\Locator\LocatorInterface */ private $locator; + /** * @var \Ibexa\Behat\Browser\Element\ElementInterface */ @@ -88,7 +89,8 @@ public function hasClass(string $expectedClass): ElementInterface { $actualClass = $this->element->getAttribute('class'); - Assert::assertTrue($this->element->hasClass($expectedClass), + Assert::assertTrue( + $this->element->hasClass($expectedClass), sprintf( "Failed asserting that element with %s locator '%s': '%s' has '%s' class, instead class is '%s'", $this->locator->getType(), diff --git a/src/lib/Browser/Context/AuthenticationContext.php b/src/lib/Browser/Context/AuthenticationContext.php index 807519d1..115246c0 100644 --- a/src/lib/Browser/Context/AuthenticationContext.php +++ b/src/lib/Browser/Context/AuthenticationContext.php @@ -19,6 +19,7 @@ class AuthenticationContext extends RawMinkContext * @var \Ibexa\Behat\Browser\Page\LoginPage */ private $loginPage; + /** * @var \Ibexa\Behat\Browser\Page\RedirectLoginPage */ diff --git a/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php b/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php index f3f1e738..ed7e69fb 100644 --- a/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php +++ b/src/lib/Browser/Element/Debug/Highlighting/BaseElement.php @@ -118,9 +118,9 @@ private function setAttribute(ElementInterface $element, string $attribute, stri private function getElementScript(ElementInterface $element): string { return sprintf( - 'document.evaluate("%s", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue', - $element->getXPath() - ); + 'document.evaluate("%s", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue', + $element->getXPath() + ); } private function getRandomColor(): string diff --git a/src/lib/Browser/Element/ElementCollection.php b/src/lib/Browser/Element/ElementCollection.php index f03db6c2..42c0e097 100644 --- a/src/lib/Browser/Element/ElementCollection.php +++ b/src/lib/Browser/Element/ElementCollection.php @@ -21,6 +21,7 @@ class ElementCollection implements ElementCollectionInterface { /** @var ElementInterface[]|\Traversable */ private $elements; + /** * @var \Ibexa\Behat\Browser\Locator\LocatorInterface */ diff --git a/src/lib/Browser/FileUpload/FileUploadHelper.php b/src/lib/Browser/FileUpload/FileUploadHelper.php index 56abb792..8a14fd25 100644 --- a/src/lib/Browser/FileUpload/FileUploadHelper.php +++ b/src/lib/Browser/FileUpload/FileUploadHelper.php @@ -15,6 +15,7 @@ class FileUploadHelper { /** @var \Behat\Mink\Session */ private $session; + /** @var \FriendsOfBehat\SymfonyExtension\Mink\MinkParameters */ private $minkParameters; diff --git a/src/lib/Browser/Routing/Router.php b/src/lib/Browser/Routing/Router.php index d030bc43..e0b12e88 100644 --- a/src/lib/Browser/Routing/Router.php +++ b/src/lib/Browser/Routing/Router.php @@ -8,9 +8,9 @@ namespace Ibexa\Behat\Browser\Routing; +use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters; use Ibexa\Core\MVC\Symfony\Routing\SimplifiedRequest; use Ibexa\Core\MVC\Symfony\SiteAccess\Router as CoreRouter; -use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters; final class Router { diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index e9a7ee5f..45e07a27 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -19,9 +19,13 @@ class ConfigurationContext implements Context { private const SITEACCESS_KEY_FORMAT = 'ezplatform.system.%s.%s'; private const SITEACCESS_MATCHER_KEY = 'ezplatform.siteaccess.match'; + private $ezplatformConfigFilePath; + private $configFilePath; + private $projectDir; + /** * @var \EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface */ diff --git a/src/lib/Core/Context/FileContext.php b/src/lib/Core/Context/FileContext.php index 443e8ba3..ef80610b 100644 --- a/src/lib/Core/Context/FileContext.php +++ b/src/lib/Core/Context/FileContext.php @@ -16,6 +16,7 @@ class FileContext implements Context { private const SOURCE_FILE_DIRECTORY = 'vendor/ezsystems/behatbundle/src/lib/Data'; + /** @var string */ private $projectDirectory; diff --git a/src/lib/Subscriber/AbstractProcessStage.php b/src/lib/Subscriber/AbstractProcessStage.php index 23345ed7..ef6a01ab 100644 --- a/src/lib/Subscriber/AbstractProcessStage.php +++ b/src/lib/Subscriber/AbstractProcessStage.php @@ -8,11 +8,11 @@ namespace EzSystems\Behat\Subscriber; +use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use EzSystems\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Core\Repository\Values\User\User; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\TransitionEvent; use PHPUnit\Framework\Assert; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -108,7 +108,7 @@ public function execute(Event $event): void try { $this->doExecute($event); } catch (\Exception $ex) { - $this->logger->log(LogLevel::ERROR, sprintf('Error occured during %s Stage: %s', get_class($this), $ex->getMessage())); + $this->logger->log(LogLevel::ERROR, sprintf('Error occured during %s Stage: %s', static::class, $ex->getMessage())); return; } diff --git a/src/lib/Subscriber/CreateContentDraft.php b/src/lib/Subscriber/CreateContentDraft.php index 7d3d0b52..f5237420 100644 --- a/src/lib/Subscriber/CreateContentDraft.php +++ b/src/lib/Subscriber/CreateContentDraft.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\API\Facade\ContentFacade; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/lib/Subscriber/EditContent.php b/src/lib/Subscriber/EditContent.php index 5766f356..aa4f069e 100644 --- a/src/lib/Subscriber/EditContent.php +++ b/src/lib/Subscriber/EditContent.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\ContentService; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\ContentDataProvider; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/lib/Subscriber/InitialStage.php b/src/lib/Subscriber/InitialStage.php index 32e3c938..163b53d7 100644 --- a/src/lib/Subscriber/InitialStage.php +++ b/src/lib/Subscriber/InitialStage.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\API\Facade\SearchFacade; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\InitialEvent; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/lib/Subscriber/PublishDraft.php b/src/lib/Subscriber/PublishDraft.php index fae7d715..f9693b9a 100644 --- a/src/lib/Subscriber/PublishDraft.php +++ b/src/lib/Subscriber/PublishDraft.php @@ -8,12 +8,12 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\ContentService; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/src/lib/Subscriber/PublishInTheFuture.php b/src/lib/Subscriber/PublishInTheFuture.php index 8afa599d..e4ddbdf7 100644 --- a/src/lib/Subscriber/PublishInTheFuture.php +++ b/src/lib/Subscriber/PublishInTheFuture.php @@ -8,11 +8,11 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Scheduler\Repository\DateBasedPublishServiceInterface; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; diff --git a/src/lib/Subscriber/Review.php b/src/lib/Subscriber/Review.php index fcfd1155..618e8382 100644 --- a/src/lib/Subscriber/Review.php +++ b/src/lib/Subscriber/Review.php @@ -8,13 +8,13 @@ namespace EzSystems\Behat\Subscriber; -use Ibexa\Contracts\Core\Repository\ContentService; -use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Contracts\Core\Repository\UserService; use EzSystems\Behat\API\ContentData\ContentDataProvider; use EzSystems\Behat\API\ContentData\RandomDataGenerator; use EzSystems\Behat\Event\Events; use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php index b3358f0a..0311307b 100644 --- a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php +++ b/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -66,7 +66,8 @@ private function createChildElement(bool $hasStartedTransition, bool $hasEndedTr { $childElement = $this->createStub(ElementInterface::class); $childElement->method('getText')->willReturn('ChildText'); - $childElement->method('hasClass')->will($this->returnValueMap([ + $childElement->method('hasClass')->will($this->returnValueMap( + [ ['ibexa-selenium-transition-started', $hasStartedTransition], ['ibexa-selenium-transition-ended', $hasEndedTransition], ] diff --git a/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php b/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php index 2d3c684d..d7a1a0bf 100644 --- a/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php +++ b/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php @@ -38,7 +38,8 @@ public function testNoMatchWhenNoCriterionMatches(): void $nonmatchingElement = $this->createElement('Test3'); Assert::assertFalse($testedCriterion->matches($nonmatchingElement)); - Assert::assertEquals("LogicalOr criterion failed. Condition error messages: + Assert::assertEquals( + "LogicalOr criterion failed. Condition error messages: Could not find element named: 'Test1'. Found names: Test3 instead. CSS locator 'id': 'selector'. Could not find element named: 'Test2'. Found names: Test3 instead. CSS locator 'id': 'selector'. ", diff --git a/tests/Browser/Element/ElementCollectionTest.php b/tests/Browser/Element/ElementCollectionTest.php index 89843769..ee163966 100644 --- a/tests/Browser/Element/ElementCollectionTest.php +++ b/tests/Browser/Element/ElementCollectionTest.php @@ -25,7 +25,9 @@ protected function setUp(): void { $this->collection = $this->createCollection( new CSSLocator('identifier', 'selector'), - 'Element1', 'Element2', 'Element3' + 'Element1', + 'Element2', + 'Element3' ); } @@ -71,8 +73,10 @@ public function dataProviderTestAny(): array return [ [ $this->createCollection( - new CSSLocator('identifier', 'selector'), - 'Element1', 'Element2', 'Element3' + new CSSLocator('identifier', 'selector'), + 'Element1', + 'Element2', + 'Element3' ), true, ], @@ -99,7 +103,9 @@ public function dataProviderTestEmpty(): array [ $this->createCollection( new CSSLocator('identifier', 'selector'), - 'Element1', 'Element2', 'Element3' + 'Element1', + 'Element2', + 'Element3' ), false, ], @@ -139,7 +145,9 @@ public function testFilterBy(): void { $collection = $this->createCollection( new CSSLocator('identifier', 'selector'), - 'AAA', 'AAA', 'ZZZ' + 'AAA', + 'AAA', + 'ZZZ' ); Assert::assertEquals( @@ -152,7 +160,9 @@ public function testFilter(): void { $collection = $this->createCollection( new CSSLocator('identifier', 'selector'), - 'AAA', 'AAA', 'ZZZ' + 'AAA', + 'AAA', + 'ZZZ' ); Assert::assertEquals( @@ -167,7 +177,9 @@ public function testGetBy(): void { $collection = $this->createCollection( new CSSLocator('identifier', 'selector'), - 'AAA', 'BBB', 'ZZZ' + 'AAA', + 'BBB', + 'ZZZ' ); Assert::assertEquals( @@ -180,7 +192,9 @@ public function testGet(): void { $collection = $this->createCollection( new CSSLocator('identifier', 'selector'), - 'AAA', 'BBB', 'ZZZ' + 'AAA', + 'BBB', + 'ZZZ' ); Assert::assertEquals( diff --git a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php b/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php index 2cc14c75..06c341ea 100644 --- a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php +++ b/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php @@ -8,10 +8,10 @@ namespace EzSystems\Behat\Test\Core\Configuration; -use Ibexa\Core\Repository\Values\Content\Location; use EzSystems\Behat\API\Facade\ContentFacade; use EzSystems\Behat\Core\Configuration\ConfigurationEditor; use EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor; +use Ibexa\Core\Repository\Values\Content\Location; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; From 382762777da6501e3b4ec89b3a2771371279f1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 28 Jan 2022 16:24:32 +0100 Subject: [PATCH 22/85] Rebranded configuration files --- features/examples/configuration.feature | 2 +- features/setup/multirepository/multirepository.feature | 2 +- src/lib/Core/Context/ConfigurationContext.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/features/examples/configuration.feature b/features/examples/configuration.feature index 3a36cb90..ead50035 100644 --- a/features/examples/configuration.feature +++ b/features/examples/configuration.feature @@ -11,7 +11,7 @@ Feature: Example scenarios showing how to set configuration | languages | pol-PL | Scenario: Configure Varnish as http cache - Given I set configuration to "ezplatform.http_cache" + Given I set configuration to "ibexa.http_cache" """ purge_type: 'http' """ diff --git a/features/setup/multirepository/multirepository.feature b/features/setup/multirepository/multirepository.feature index 819e8896..f5e5cddc 100644 --- a/features/setup/multirepository/multirepository.feature +++ b/features/setup/multirepository/multirepository.feature @@ -11,7 +11,7 @@ Feature: Multirepository setup for testing second_connection: url: '%env(resolve:DATABASE_URL)%' """ - And I set configuration to "ezplatform.repositories.new_repository" + And I set configuration to "ibexa.repositories.new_repository" """ storage: engine: 'legacy' diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index 45e07a27..e7ae8146 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -17,8 +17,8 @@ class ConfigurationContext implements Context { - private const SITEACCESS_KEY_FORMAT = 'ezplatform.system.%s.%s'; - private const SITEACCESS_MATCHER_KEY = 'ezplatform.siteaccess.match'; + private const SITEACCESS_KEY_FORMAT = 'ibexa.system.%s.%s'; + private const SITEACCESS_MATCHER_KEY = 'ibexa.siteaccess.match'; private $ezplatformConfigFilePath; @@ -48,8 +48,8 @@ public function iAddSiteaccessWithSettings($siteaccessName, $siteaccessGroup, Ta { $config = $this->configurationEditor->getConfigFromFile($this->ezplatformConfigFilePath); - $config = $this->configurationEditor->append($config, 'ezplatform.siteaccess.list', $siteaccessName); - $config = $this->configurationEditor->append($config, sprintf('ezplatform.siteaccess.groups.%s', $siteaccessGroup), $siteaccessName); + $config = $this->configurationEditor->append($config, 'ibexa.siteaccess.list', $siteaccessName); + $config = $this->configurationEditor->append($config, sprintf('ibexa.siteaccess.groups.%s', $siteaccessGroup), $siteaccessName); foreach ($settings->getHash() as $setting) { $key = $setting['key']; From fb31b4cf0255a5af291f79d2ae42f187d7d9a122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 28 Jan 2022 16:29:02 +0100 Subject: [PATCH 23/85] Fixed CS job --- .github/workflows/ci.yaml | 5 +++-- .php-cs-fixer.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9908fd6..2a1d21d7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,13 +44,13 @@ jobs: - name: Run test suite run: composer run-script --timeout=600 test - cs_fix: + cs-fix: name: Run code style check runs-on: "ubuntu-20.04" strategy: matrix: php: - - "7.4" + - '8.0' steps: - uses: actions/checkout@v2 @@ -59,6 +59,7 @@ jobs: with: php-version: ${{ matrix.php }} coverage: none + extensions: 'pdo_sqlite, gd' tools: cs2pr - uses: "ramsey/composer-install@v1" diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index cacf74b2..2823a38a 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -1,4 +1,3 @@ - Date: Fri, 28 Jan 2022 16:33:37 +0100 Subject: [PATCH 24/85] Rebranded Richtext configuration --- .../custom_styles.feature | 18 ++++++++--------- .../richtextConfiguration/custom_tags.feature | 20 +++++++++---------- .../translations/highlighted_block.en.yaml | 2 +- .../translations/highlighted_word.en.yaml | 2 +- .../CustomTag/translations/ezfacebook.en.yaml | 8 ++++---- .../CustomTag/translations/eztwitter.en.yaml | 20 +++++++++---------- .../CustomTag/translations/ezyoutube.en.yaml | 16 +++++++-------- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/features/setup/richtextConfiguration/custom_styles.feature b/features/setup/richtextConfiguration/custom_styles.feature index 3a263d34..26608b29 100644 --- a/features/setup/richtextConfiguration/custom_styles.feature +++ b/features/setup/richtextConfiguration/custom_styles.feature @@ -2,31 +2,31 @@ Feature: Example scenarios showing how to set custom styles configuration Scenario: Add Highlighted Block custom styles configuration - Given I "append" configuration to "ezrichtext.custom_styles" + Given I "append" configuration to "ibexa_fieldtype_richtext.custom_styles" """ highlighted_block_test: - template: '@ezdesign/field_type/ezrichtext/custom_style/highlighted_block.html.twig' + template: '@ibexadesign/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_block.html.twig' inline: false """ And I "append" configuration to "default" siteaccess under "fieldtypes.ezrichtext.custom_styles" key """ highlighted_block_test """ - And I create a file "templates/themes/standard/field_type/ezrichtext/custom_style/highlighted_block.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_block.html.twig" - And I create a file "templates/themes/admin/field_type/ezrichtext/custom_style/highlighted_block.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_block.html.twig" + And I create a file "templates/themes/standard/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_block.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_block.html.twig" + And I create a file "templates/themes/admin/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_block.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_block.html.twig" And I create a file "translations/custom_styles.en.yaml" with content from "Files/Richtext/CustomStyle/translations/highlighted_block.en.yaml" Scenario: Add Highlighted Word custom styles configuration - Given I "append" configuration to "ezrichtext.custom_styles" + Given I "append" configuration to "ibexa_fieldtype_richtext.custom_styles" """ highlighted_word_test: - template: '@ezdesign/field_type/ezrichtext/custom_style/highlighted_word.html.twig' + template: '@ibexadesign/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_word.html.twig' inline: true """ And I "append" configuration to "default" siteaccess under "fieldtypes.ezrichtext.custom_styles" key """ highlighted_word_test """ - And I create a file "templates/themes/standard/field_type/ezrichtext/custom_style/highlighted_word.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_word.html.twig" - And I create a file "templates/themes/admin/field_type/ezrichtext/custom_style/highlighted_word.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_word.html.twig" - And I append to "translations/custom_styles.en.yaml" file "Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml" \ No newline at end of file + And I create a file "templates/themes/standard/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_word.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_word.html.twig" + And I create a file "templates/themes/admin/field_type/ibexa_fieldtype_richtext/custom_style/highlighted_word.html.twig" with content from "Files/Richtext/CustomStyle/twig/highlighted_word.html.twig" + And I append to "translations/custom_styles.en.yaml" file "Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml" diff --git a/features/setup/richtextConfiguration/custom_tags.feature b/features/setup/richtextConfiguration/custom_tags.feature index 48a0eccf..06b56d92 100644 --- a/features/setup/richtextConfiguration/custom_tags.feature +++ b/features/setup/richtextConfiguration/custom_tags.feature @@ -2,11 +2,11 @@ Feature: Example scenarios showing how to set custom tags configuration Scenario: Add YouTube custom tag configuration - Given I "append" configuration to "ezrichtext.custom_tags" + Given I "append" configuration to "ibexa_fieldtype_richtext.custom_tags" """ ezyoutube_test: # The template used for front-end rendering of the custom tag - template: field_type/ezrichtext/custom_tag/ezyoutube.html.twig + template: field_type/ibexa_fieldtype_richtext/custom_tag/ezyoutube.html.twig # An icon for the custom tag as displayed in the Online Editor's toolbar. icon: '/bundles/ezplatformrichtext/assets/images/custom_tags/admin/icons/video.svg#video' attributes: @@ -38,14 +38,14 @@ Feature: Example scenarios showing how to set custom tags configuration """ ezyoutube_test """ - And I create a file "templates/field_type/ezrichtext/custom_tag/ezyoutube.html.twig" with content from "Files/Richtext/CustomTag/twig/ezyoutube.html.twig" + And I create a file "templates/field_type/ibexa_fieldtype_richtext/custom_tag/ezyoutube.html.twig" with content from "Files/Richtext/CustomTag/twig/ezyoutube.html.twig" And I create a file "translations/custom_tags.en.yaml" with content from "Files/Richtext/CustomTag/translations/ezyoutube.en.yaml" Scenario: Add Twitter custom tag configuration - Given I "append" configuration to "ezrichtext.custom_tags" + Given I "append" configuration to "ibexa_fieldtype_richtext.custom_tags" """ eztwitter_test: - template: field_type/ezrichtext/custom_tag/eztwitter.html.twig + template: field_type/ibexa_fieldtype_richtext/custom_tag/eztwitter.html.twig icon: '/bundles/ezplatformrichtext/assets/images/custom_tags/admin/icons/twitter.svg#twitter' attributes: tweet_url: @@ -83,14 +83,14 @@ Feature: Example scenarios showing how to set custom tags configuration """ eztwitter_test """ - And I create a file "templates/field_type/ezrichtext/custom_tag/eztwitter.html.twig" with content from "Files/Richtext/CustomTag/twig/eztwitter.html.twig" + And I create a file "templates/field_type/ibexa_fieldtype_richtext/custom_tag/eztwitter.html.twig" with content from "Files/Richtext/CustomTag/twig/eztwitter.html.twig" And I append to "translations/custom_tags.en.yaml" file "Files/Richtext/CustomTag/translations/eztwitter.en.yaml" Scenario: Add Facebook custom tag configuration - Given I "append" configuration to "ezrichtext.custom_tags" + Given I "append" configuration to "ibexa_fieldtype_richtext.custom_tags" """ ezfacebook_test: - template: field_type/ezrichtext/custom_tag/ezfacebook.html.twig + template: field_type/ibexa_fieldtype_richtext/custom_tag/ezfacebook.html.twig icon: '/bundles/ezplatformrichtext/assets/images/custom_tags/admin/icons/facebook.svg#facebook' attributes: post_url: @@ -103,5 +103,5 @@ Feature: Example scenarios showing how to set custom tags configuration """ ezfacebook_test """ - And I create a file "templates/field_type/ezrichtext/custom_tag/ezfacebook.html.twig" with content from "Files/Richtext/CustomTag/twig/ezfacebook.html.twig" - And I append to "translations/custom_tags.en.yaml" file "Files/Richtext/CustomTag/translations/ezfacebook.en.yaml" \ No newline at end of file + And I create a file "templates/field_type/ibexa_fieldtype_richtext/custom_tag/ezfacebook.html.twig" with content from "Files/Richtext/CustomTag/twig/ezfacebook.html.twig" + And I append to "translations/custom_tags.en.yaml" file "Files/Richtext/CustomTag/translations/ezfacebook.en.yaml" diff --git a/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_block.en.yaml b/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_block.en.yaml index dc78a59a..e6a95f78 100644 --- a/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_block.en.yaml +++ b/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_block.en.yaml @@ -1,2 +1,2 @@ -ezrichtext.custom_styles.highlighted_block_test.label: Highlighted block \ No newline at end of file +ibexa_fieldtype_richtext.custom_styles.highlighted_block_test.label: Highlighted block diff --git a/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml b/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml index 4dcf10ec..ef8856ac 100644 --- a/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml +++ b/src/lib/Data/Files/Richtext/CustomStyle/translations/highlighted_word.en.yaml @@ -1,2 +1,2 @@ -ezrichtext.custom_styles.highlighted_word_test.label: Highlighted word \ No newline at end of file +ibexa_fieldtype_richtext.custom_styles.highlighted_word_test.label: Highlighted word diff --git a/src/lib/Data/Files/Richtext/CustomTag/translations/ezfacebook.en.yaml b/src/lib/Data/Files/Richtext/CustomTag/translations/ezfacebook.en.yaml index 976eff3c..2a2b7045 100644 --- a/src/lib/Data/Files/Richtext/CustomTag/translations/ezfacebook.en.yaml +++ b/src/lib/Data/Files/Richtext/CustomTag/translations/ezfacebook.en.yaml @@ -1,5 +1,5 @@ -ezrichtext.custom_tags.ezfacebook_test.label: Facebook -ezrichtext.custom_tags.ezfacebook_test.description: '' -ezrichtext.custom_tags.ezfacebook_test.attributes.post_url.label: 'Post URL' -ezrichtext.custom_tags.ezfacebook_test.attributes.width.label: Width \ No newline at end of file +ibexa_fieldtype_richtext.custom_tags.ezfacebook_test.label: Facebook +ibexa_fieldtype_richtext.custom_tags.ezfacebook_test.description: '' +ibexa_fieldtype_richtext.custom_tags.ezfacebook_test.attributes.post_url.label: 'Post URL' +ibexa_fieldtype_richtext.custom_tags.ezfacebook_test.attributes.width.label: Width diff --git a/src/lib/Data/Files/Richtext/CustomTag/translations/eztwitter.en.yaml b/src/lib/Data/Files/Richtext/CustomTag/translations/eztwitter.en.yaml index 177046e3..6aa7f09f 100644 --- a/src/lib/Data/Files/Richtext/CustomTag/translations/eztwitter.en.yaml +++ b/src/lib/Data/Files/Richtext/CustomTag/translations/eztwitter.en.yaml @@ -1,11 +1,11 @@ -ezrichtext.custom_tags.eztwitter_test.label: Twitter -ezrichtext.custom_tags.eztwitter_test.description: '' -ezrichtext.custom_tags.eztwitter_test.attributes.cards.label: Cards -ezrichtext.custom_tags.eztwitter_test.attributes.conversation.label: Conversation -ezrichtext.custom_tags.eztwitter_test.attributes.dnt.label: DNT -ezrichtext.custom_tags.eztwitter_test.attributes.lang.label: Lang -ezrichtext.custom_tags.eztwitter_test.attributes.link_color.label: 'Link color' -ezrichtext.custom_tags.eztwitter_test.attributes.theme.label: Theme -ezrichtext.custom_tags.eztwitter_test.attributes.tweet_url.label: 'Tweet url' -ezrichtext.custom_tags.eztwitter_test.attributes.width.label: Width \ No newline at end of file +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.label: Twitter +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.description: '' +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.cards.label: Cards +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.conversation.label: Conversation +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.dnt.label: DNT +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.lang.label: Lang +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.link_color.label: 'Link color' +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.theme.label: Theme +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.tweet_url.label: 'Tweet url' +ibexa_fieldtype_richtext.custom_tags.eztwitter_test.attributes.width.label: Width diff --git a/src/lib/Data/Files/Richtext/CustomTag/translations/ezyoutube.en.yaml b/src/lib/Data/Files/Richtext/CustomTag/translations/ezyoutube.en.yaml index 28d59e59..34ebb8e0 100644 --- a/src/lib/Data/Files/Richtext/CustomTag/translations/ezyoutube.en.yaml +++ b/src/lib/Data/Files/Richtext/CustomTag/translations/ezyoutube.en.yaml @@ -1,8 +1,8 @@ -ezrichtext.custom_tags.ezyoutube_test.label: Youtube -ezrichtext.custom_tags.ezyoutube_test.description: '' -ezrichtext.custom_tags.ezyoutube_test.attributes.autoplay.label: Autoplay -ezrichtext.custom_tags.ezyoutube_test.attributes.height.label: Height -ezrichtext.custom_tags.ezyoutube_test.attributes.title.label: Title -ezrichtext.custom_tags.ezyoutube_test.attributes.video_url.label: Video url -ezrichtext.custom_tags.ezyoutube_test.attributes.width.label: Width -ezrichtext.custom_tags.ezyoutube_test.attributes.align.label: Align \ No newline at end of file +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.label: Youtube +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.description: '' +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.autoplay.label: Autoplay +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.height.label: Height +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.title.label: Title +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.video_url.label: Video url +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.width.label: Width +ibexa_fieldtype_richtext.custom_tags.ezyoutube_test.attributes.align.label: Align From 2ac52a76162e239fdd53f53ef6d45cde438bf3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 28 Jan 2022 16:41:43 +0100 Subject: [PATCH 25/85] Added gitignore entry for bumped fixer --- .gitignore | 1 + .php-cs-fixer.cache | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .php-cs-fixer.cache diff --git a/.gitignore b/.gitignore index 7294126b..c7b7a600 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ composer.lock composer.phar .phpunit.result.cache .php_cs.cache +.php-cs-fixer.cache diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache deleted file mode 100644 index ddede05f..00000000 --- a/.php-cs-fixer.cache +++ /dev/null @@ -1 +0,0 @@ -{"php":"7.4.26","version":"3.4.0:v3.4.0#47177af1cfb9dab5d1cc4daf91b7179c2efe7fad","indent":" ","lineEnding":"\n","rules":{"declare_strict_types":true,"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"constant_case":{"case":"lower"},"lowercase_keywords":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_closure":true},"class_attributes_separation":{"elements":{"method":"one","property":"one"}},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"method_argument_space":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_indent":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_tag_type":{"tags":{"inheritdoc":"inline"}},"general_phpdoc_tag_rename":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":{"replacements":{"type":"var","link":"see"}},"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"single_trait_insert_per_statement":true,"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"dir_constant":true,"ereg_to_preg":true,"error_suppression":true,"fopen_flag_order":true,"function_to_constant":true,"implode_call":true,"is_null":true,"modernize_types_casting":true,"native_constant_invocation":{"fix_built_in":false,"include":["DIRECTORY_SEPARATOR","PHP_SAPI","PHP_VERSION_ID"],"scope":"namespaced"},"no_alias_functions":true,"no_homoglyph_names":true,"non_printable_character":true,"php_unit_construct":true,"psr_autoloading":true,"set_type_to_cast":true,"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"},"single_blank_line_before_namespace":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"static_lambda":true,"ordered_imports":true,"header_comment":{"comment_type":"PHPDoc","header":"@copyright Copyright (C) Ibexa AS. All rights reserved.\n@license For full copyright and license information view LICENSE file distributed with this source code.","location":"after_open","separate":"top"},"AdamWojs\/phpdoc_force_fqcn_fixer":true},"hashes":{"src\/bundle\/Initializer\/BehatSiteAccessInitializer.php":2002336590,"src\/bundle\/EzSystemsBehatBundle.php":1750058674,"src\/bundle\/Templating\/Twig\/PHPTypeExtension.php":1719429617,"src\/bundle\/Controller\/ExceptionController.php":47193292,"src\/bundle\/Controller\/CurrentUserDataController.php":3584893852,"src\/bundle\/Controller\/UnauthenticatedRedirectController.php":2729694909,"src\/bundle\/Controller\/RenderController.php":3656776178,"src\/bundle\/BehatExtension.php":3194639878,"src\/bundle\/Command\/CreateExampleDataCommand.php":3037181105,"src\/bundle\/Command\/GetPullRequestDataCommand.php":634814666,"src\/bundle\/Command\/TestSiteaccessCommand.php":1473619159,"src\/bundle\/Command\/CreateExampleDataManagerCommand.php":1638312727,"src\/bundle\/Command\/CreateLanguageCommand.php":2957742906,"src\/bundle\/DependencyInjection\/eZBehatExtension.php":3422631746,"src\/bundle\/DependencyInjection\/Compiler\/FieldTypeDataProviderPass.php":3311607453,"src\/bundle\/DependencyInjection\/Compiler\/ElementFactoryCompilerPass.php":1399154019,"src\/bundle\/DependencyInjection\/Compiler\/LimitationParserPass.php":2181155052,"src\/lib\/QueryType\/FoldersUnderMediaQueryType.php":1648646101,"src\/lib\/Core\/Configuration\/ConfigurationEditorInterface.php":4040658939,"src\/lib\/Core\/Configuration\/LocationAwareConfigurationEditor.php":4255400751,"src\/lib\/Core\/Configuration\/ConfigurationEditor.php":738574370,"src\/lib\/Core\/Context\/TimeContext.php":300402635,"src\/lib\/Core\/Context\/FileContext.php":807873755,"src\/lib\/Core\/Context\/ConfigurationContext.php":3032088253,"src\/lib\/Core\/Behat\/TableNodeExtension.php":3592141403,"src\/lib\/Core\/Behat\/ArgumentParser.php":1312792765,"src\/lib\/Core\/Log\/LogFileReader.php":1889300066,"src\/lib\/Core\/Log\/TestLogProvider.php":2488327747,"src\/lib\/Core\/Debug\/InteractiveDebuggerTrait.php":4044840925,"src\/lib\/Core\/Debug\/Shell\/Shell.php":3224187909,"src\/lib\/Core\/Debug\/Matcher\/ObjectFunctionCallChainMatcher.php":3340165448,"src\/lib\/Core\/Debug\/Matcher\/ThisObjectMethodsMatcher.php":3968836347,"src\/lib\/Core\/Debug\/Command\/ShowURLCommand.php":483544228,"src\/lib\/Core\/Debug\/Command\/GoBackCommand.php":2844465322,"src\/lib\/Core\/Debug\/Command\/RefreshPageCommand.php":3215648951,"src\/lib\/Core\/Debug\/Command\/TakeScreenshotCommand.php":3952416661,"src\/lib\/Core\/Debug\/Command\/ShowHTMLCommand.php":2322737389,"src\/lib\/Browser\/FileUpload\/FileUploadHelper.php":1293416823,"src\/lib\/Browser\/Page\/LoginPage.php":2709919473,"src\/lib\/Browser\/Page\/PageInterface.php":2665739008,"src\/lib\/Browser\/Page\/Preview\/PagePreviewRegistry.php":2471758927,"src\/lib\/Browser\/Page\/Preview\/PagePreviewInterface.php":1426235086,"src\/lib\/Browser\/Page\/Preview\/FolderPreview.php":1989903023,"src\/lib\/Browser\/Page\/Page.php":1616087642,"src\/lib\/Browser\/Page\/PageRegistry.php":1216761387,"src\/lib\/Browser\/Page\/RedirectLoginPage.php":1677871096,"src\/lib\/Browser\/Locator\/VisibleCSSLocator.php":4019040745,"src\/lib\/Browser\/Locator\/LocatorInterface.php":2371848562,"src\/lib\/Browser\/Locator\/CSSLocator.php":2105213558,"src\/lib\/Browser\/Locator\/XPathLocator.php":3847724366,"src\/lib\/Browser\/Locator\/CSSLocatorBuilder.php":3391184374,"src\/lib\/Browser\/Locator\/LocatorCollection.php":2115061589,"src\/lib\/Browser\/Locator\/BaseLocator.php":1245303114,"src\/lib\/Browser\/Context\/DebuggingContext.php":1079762865,"src\/lib\/Browser\/Context\/ContentPreviewContext.php":924454052,"src\/lib\/Browser\/Context\/BrowserContext.php":757795377,"src\/lib\/Browser\/Context\/AuthenticationContext.php":2548858477,"src\/lib\/Browser\/Element\/Element.php":2434313350,"src\/lib\/Browser\/Element\/ElementCollectionInterface.php":2822900023,"src\/lib\/Browser\/Element\/Mapper\/MapperInterface.php":4144650502,"src\/lib\/Browser\/Element\/Mapper\/ElementTextMapper.php":2499502488,"src\/lib\/Browser\/Element\/ElementCollection.php":713656180,"src\/lib\/Browser\/Element\/Criterion\/ChildElementTextCriterion.php":3062133723,"src\/lib\/Browser\/Element\/Criterion\/ElementTextCriterion.php":4047513666,"src\/lib\/Browser\/Element\/Criterion\/ElementTextFragmentCriterion.php":1184441132,"src\/lib\/Browser\/Element\/Criterion\/ElementAttributeCriterion.php":340054511,"src\/lib\/Browser\/Element\/Criterion\/CriterionInterface.php":3976097957,"src\/lib\/Browser\/Element\/Criterion\/LogicalOrCriterion.php":2767455630,"src\/lib\/Browser\/Element\/RootElementInterface.php":385602756,"src\/lib\/Browser\/Element\/BaseElement.php":2564347928,"src\/lib\/Browser\/Element\/Condition\/ElementExistsCondition.php":2854511430,"src\/lib\/Browser\/Element\/Condition\/ElementsCountCondition.php":1741184555,"src\/lib\/Browser\/Element\/Condition\/ConditionInterface.php":2413694900,"src\/lib\/Browser\/Element\/Condition\/ElementNotExistsCondition.php":2483630598,"src\/lib\/Browser\/Element\/Condition\/ElementTransitionHasEndedCondition.php":4013234557,"src\/lib\/Browser\/Element\/Condition\/ElementsCountGreaterThanCondition.php":4195681639,"src\/lib\/Browser\/Element\/ElementInterface.php":557654181,"src\/lib\/Browser\/Element\/BaseElementInterface.php":230996551,"src\/lib\/Browser\/Element\/Factory\/ElementFactory.php":666013110,"src\/lib\/Browser\/Element\/Factory\/ElementFactoryInterface.php":644819173,"src\/lib\/Browser\/Element\/Factory\/Debug\/Highlighting\/ElementFactory.php":4200527132,"src\/lib\/Browser\/Element\/Factory\/Debug\/Interactive\/ElementFactory.php":3493657266,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/Element.php":4017539156,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/BaseElement.php":2935381397,"src\/lib\/Browser\/Element\/Debug\/Highlighting\/RootElement.php":436863522,"src\/lib\/Browser\/Element\/Debug\/Interactive\/Element.php":1862890452,"src\/lib\/Browser\/Element\/Debug\/Interactive\/ElementCollection.php":2166825888,"src\/lib\/Browser\/Element\/Debug\/Interactive\/BaseElement.php":1748443230,"src\/lib\/Browser\/Element\/Debug\/Interactive\/RootElement.php":2228655536,"src\/lib\/Browser\/Element\/RootElement.php":349503287,"src\/lib\/Browser\/Component\/ComponentInterface.php":3521196349,"src\/lib\/Browser\/Component\/Component.php":1789343111,"src\/lib\/Browser\/Assert\/CollectionAssert.php":3046912180,"src\/lib\/Browser\/Assert\/ElementAssertInterface.php":401047847,"src\/lib\/Browser\/Assert\/ElementAssert.php":1124163405,"src\/lib\/Browser\/Assert\/CollectionAssertInterface.php":2133910095,"src\/lib\/Browser\/Assert\/Debug\/Interactive\/CollectionAssert.php":747802423,"src\/lib\/Browser\/Assert\/Debug\/Interactive\/ElementAssert.php":2819319489,"src\/lib\/Browser\/Environment\/ParameterProvider.php":223848782,"src\/lib\/Browser\/Environment\/ParameterProviderInterface.php":2307291194,"src\/lib\/Browser\/Routing\/Router.php":2872789444,"src\/lib\/Browser\/Filter\/BrowserLogFilter.php":2424768828,"src\/lib\/Browser\/Exception\/ElementNotFoundException.php":2666902227,"src\/lib\/Browser\/Exception\/TimeoutException.php":2293766227,"src\/lib\/API\/Context\/ObjectStateContext.php":2183391778,"src\/lib\/API\/Context\/UserContext.php":3733576626,"src\/lib\/API\/Context\/LimitationParser\/UserGroupLimitationParser.php":1066481485,"src\/lib\/API\/Context\/LimitationParser\/OwnerLimitationParser.php":2703336235,"src\/lib\/API\/Context\/LimitationParser\/NewSectionLimitationParser.php":3661768215,"src\/lib\/API\/Context\/LimitationParser\/ContentTypeLimitationParser.php":1026609545,"src\/lib\/API\/Context\/LimitationParser\/WorkflowStageLimitationParser.php":1834933158,"src\/lib\/API\/Context\/LimitationParser\/SubtreeLimitationParser.php":1106984934,"src\/lib\/API\/Context\/LimitationParser\/ObjectStateLimitationParser.php":1538053547,"src\/lib\/API\/Context\/LimitationParser\/LocationLimitationParser.php":1245963752,"src\/lib\/API\/Context\/LimitationParser\/LimitationParserInterface.php":1780196646,"src\/lib\/API\/Context\/LimitationParser\/ParentUserGroupLimitationParser.php":963684769,"src\/lib\/API\/Context\/LimitationParser\/ParentDepthLimitationParser.php":2828645753,"src\/lib\/API\/Context\/LimitationParser\/LimitationParsersCollector.php":1344643828,"src\/lib\/API\/Context\/LimitationParser\/LanguageLimitationParser.php":1325184452,"src\/lib\/API\/Context\/LimitationParser\/SectionLimitationParser.php":146899611,"src\/lib\/API\/Context\/LimitationParser\/FieldGroupLimitationParser.php":2198269172,"src\/lib\/API\/Context\/LimitationParser\/ParentContentTypeLimitationParser.php":98243061,"src\/lib\/API\/Context\/LimitationParser\/NewStateLimitationParser.php":128910333,"src\/lib\/API\/Context\/LimitationParser\/WorkflowTransitionLimitationParser.php":193852603,"src\/lib\/API\/Context\/LimitationParser\/ParentOwnerLimitationParser.php":4271097045,"src\/lib\/API\/Context\/LimitationParser\/SiteaccessLimitationParser.php":2370355137,"src\/lib\/API\/Context\/TrashContext.php":1996592746,"src\/lib\/API\/Context\/ContentContext.php":3913656482,"src\/lib\/API\/Context\/RoleContext.php":3820011330,"src\/lib\/API\/Context\/ContentTypeContext.php":891812060,"src\/lib\/API\/Context\/TestContext.php":1139172158,"src\/lib\/API\/Context\/LanguageContext.php":627930056,"src\/lib\/API\/Facade\/ContentTypeFacade.php":3633372326,"src\/lib\/API\/Facade\/ContentFacade.php":361900150,"src\/lib\/API\/Facade\/LanguageFacade.php":781624730,"src\/lib\/API\/Facade\/UserFacade.php":705465834,"src\/lib\/API\/Facade\/RoleFacade.php":533208065,"src\/lib\/API\/Facade\/SearchFacade.php":604668046,"src\/lib\/API\/Facade\/TrashFacade.php":3408689723,"src\/lib\/API\/ContentData\/FieldTypeNameConverter.php":1352287092,"src\/lib\/API\/ContentData\/ContentDataProvider.php":3837841561,"src\/lib\/API\/ContentData\/RandomDataGenerator.php":3297474066,"src\/lib\/API\/ContentData\/FieldTypeData\/MatrixDataProvider.php":106436603,"src\/lib\/API\/ContentData\/FieldTypeData\/AbstractFieldTypeDataProvider.php":3295563291,"src\/lib\/API\/ContentData\/FieldTypeData\/FloatDataProvider.php":4190052315,"src\/lib\/API\/ContentData\/FieldTypeData\/ISBNDataProvider.php":272658087,"src\/lib\/API\/ContentData\/FieldTypeData\/TimeDataProvider.php":2716617817,"src\/lib\/API\/ContentData\/FieldTypeData\/PasswordProvider.php":840867617,"src\/lib\/API\/ContentData\/FieldTypeData\/ImageDataProvider.php":394174470,"src\/lib\/API\/ContentData\/FieldTypeData\/FieldTypeDataProviderInterface.php":360673926,"src\/lib\/API\/ContentData\/FieldTypeData\/BinaryFileDataProvider.php":484676700,"src\/lib\/API\/ContentData\/FieldTypeData\/MapDataProvider.php":2717426481,"src\/lib\/API\/ContentData\/FieldTypeData\/CountryDataProvider.php":820872488,"src\/lib\/API\/ContentData\/FieldTypeData\/SelectionDataProvider.php":3517179834,"src\/lib\/API\/ContentData\/FieldTypeData\/EmailDataProvider.php":1414249414,"src\/lib\/API\/ContentData\/FieldTypeData\/ObjectRelationListDataProvider.php":2483669224,"src\/lib\/API\/ContentData\/FieldTypeData\/TextBlockDataProvider.php":3929720822,"src\/lib\/API\/ContentData\/FieldTypeData\/URLDataProvider.php":2319997268,"src\/lib\/API\/ContentData\/FieldTypeData\/ImageAssetDataProvider.php":2770186402,"src\/lib\/API\/ContentData\/FieldTypeData\/ObjectRelationDataProvider.php":527593256,"src\/lib\/API\/ContentData\/FieldTypeData\/MediaDataProvider.php":4176591271,"src\/lib\/API\/ContentData\/FieldTypeData\/RichTextDataProvider.php":3934619597,"src\/lib\/API\/ContentData\/FieldTypeData\/AuthorDataProvider.php":1887480567,"src\/lib\/API\/ContentData\/FieldTypeData\/DateTimeDataProvider.php":96735861,"src\/lib\/API\/ContentData\/FieldTypeData\/DateDataProvider.php":658117359,"src\/lib\/API\/ContentData\/FieldTypeData\/IntegerDataProvider.php":2203955373,"src\/lib\/API\/ContentData\/FieldTypeData\/TextLineDataProvider.php":3045648384,"src\/lib\/API\/ContentData\/FieldTypeData\/BooleanDataProvider.php":59550666,"src\/lib\/Subscriber\/Review.php":3926541404,"src\/lib\/Subscriber\/InitialStage.php":1811547087,"src\/lib\/Subscriber\/AbstractProcessStage.php":733457492,"src\/lib\/Subscriber\/EditContent.php":2465788301,"src\/lib\/Subscriber\/PublishDraft.php":519997205,"src\/lib\/Subscriber\/PublishInTheFuture.php":763112845,"src\/lib\/Subscriber\/CreateContentDraft.php":103767890,"src\/lib\/Event\/TransitionEvent.php":1709766547,"src\/lib\/Event\/Events.php":4152054631,"src\/lib\/Event\/InitialEvent.php":1472655618,"tests\/Core\/Configuration\/ConfigurationEditorTest.php":2819445536,"tests\/Core\/Configuration\/LocationAwareConfigurationEditorTest.php":3911310500,"tests\/Core\/Behat\/ArgumentParserTest.php":1943793396,"tests\/Core\/Behat\/ExtendedTableNodeTest.php":506854644,"tests\/Core\/Log\/LogFileReaderTest.php":790354740,"tests\/Browser\/Element\/ElementCollectionTest.php":4274548719,"tests\/Browser\/Element\/Mapper\/TextMapperTestCase.php":2206716554,"tests\/Browser\/Element\/ElementTest.php":756097771,"tests\/Browser\/Element\/Criterion\/ElementTextCriterionTest.php":200430177,"tests\/Browser\/Element\/Criterion\/ElementTextFragmentCriterionTest.php":792906412,"tests\/Browser\/Element\/Criterion\/LogicalOrCriterionTest.php":4058057091,"tests\/Browser\/Element\/Criterion\/ChildElementTextCriterionTest.php":2112186072,"tests\/Browser\/Element\/Criterion\/ElementAttributeCriterionTest.php":928144501,"tests\/Browser\/Element\/Condition\/ElementTransitionHasEndedConditionTest.php":3950354378,"tests\/Browser\/Element\/Condition\/ElementNotExistsConditionTest.php":3633606218,"tests\/Browser\/Element\/Condition\/ElementsCountConditionTest.php":729497062,"tests\/Browser\/Element\/Condition\/ElementExistsConditionTest.php":3702524597,"tests\/Browser\/Element\/Condition\/ElementsCountGreaterThanConditionTest.php":315385727,"tests\/Browser\/Element\/BaseTestCase.php":3490112019,"tests\/Browser\/Element\/Debug\/HighlightingElementTest.php":1851245414,"tests\/Browser\/Element\/Debug\/Assert\/Interactive\/CollectionAssertTest.php":105472978,"tests\/Browser\/Element\/Debug\/Assert\/Interactive\/ElementAssertTest.php":2575945190,"tests\/Browser\/Element\/Debug\/InteractiveElementTest.php":2544046762,"tests\/Browser\/Filter\/BrowserLogFilterTest.php":1140802726}} \ No newline at end of file From e2d3bf648dc6a290e0fb7c2428d472df887c099e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Mon, 31 Jan 2022 16:58:02 +0100 Subject: [PATCH 26/85] IBX-2153: Moved ConfigResolverInterface into contracts (#255) --- .../API/ContentData/FieldTypeData/ImageAssetDataProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php index e813b11e..57a9dbca 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php @@ -12,9 +12,9 @@ use EzSystems\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\FieldType\ImageAsset\AssetMapper; use Ibexa\Core\FieldType\ImageAsset\Value; -use Ibexa\Core\MVC\ConfigResolverInterface; class ImageAssetDataProvider extends AbstractFieldTypeDataProvider { @@ -44,7 +44,7 @@ class ImageAssetDataProvider extends AbstractFieldTypeDataProvider private $urlAliasService; /** - * @var \Ibexa\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; From a86a1e01bddd03d713e118f189d1d56aad3d90c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 1 Feb 2022 19:13:19 +0100 Subject: [PATCH 27/85] Changed default siteaccess parameter name --- src/bundle/Initializer/BehatSiteAccessInitializer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Initializer/BehatSiteAccessInitializer.php b/src/bundle/Initializer/BehatSiteAccessInitializer.php index 6e6a93c0..7838eaf5 100644 --- a/src/bundle/Initializer/BehatSiteAccessInitializer.php +++ b/src/bundle/Initializer/BehatSiteAccessInitializer.php @@ -19,7 +19,7 @@ final class BehatSiteAccessInitializer implements EventSubscriberInterface { private const EZPLATFORM_SITEACCESS_ENV_VAR = 'EZPLATFORM_SITEACCESS'; - private const DEFAULT_SITEACCESS_PARAMETER = 'ezpublish.siteaccess.default'; + private const DEFAULT_SITEACCESS_PARAMETER = 'ibexa.site_access.default'; private const EVENT_DISPATCHER_SERVICE_ID = 'event_dispatcher'; /** @var \Symfony\Component\HttpKernel\KernelInterface */ From 69a137ce84c116b8a5fd96ea87c440d33b28002b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 3 Feb 2022 16:36:54 +0100 Subject: [PATCH 28/85] Rebranded RichtextDataProvider --- .../API/ContentData/FieldTypeData/RichTextDataProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php index 6e8f8c6e..f3ded389 100644 --- a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php @@ -14,12 +14,12 @@ class RichTextDataProvider extends AbstractFieldTypeDataProvider { private const SIMPLE_RICHTEXT_XML = ' -
+
%s
'; private const COMPLEX_RICHTEXT_XML = ' -
+
%s %s
'; From 2f13f47e4218f386b1c06af24bdc4272c6abef89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 21 Feb 2022 10:59:47 +0100 Subject: [PATCH 29/85] Adjusted parameter name to rebranding (#263) --- src/bundle/DependencyInjection/eZBehatExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/DependencyInjection/eZBehatExtension.php b/src/bundle/DependencyInjection/eZBehatExtension.php index 8d0e6650..cda14861 100644 --- a/src/bundle/DependencyInjection/eZBehatExtension.php +++ b/src/bundle/DependencyInjection/eZBehatExtension.php @@ -32,7 +32,7 @@ public function process(ContainerBuilder $container) return; } - $container->setParameter('ezsettings.admin_group.notifications.success.timeout', 20000); + $container->setParameter('ibexa.site_access.config.admin_group.notifications.success.timeout', 20000); } public function prepend(ContainerBuilder $container) From d8a413fb8c2827ed05c0bcba9cdbbdadf071036b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 15 Feb 2022 19:45:27 +0100 Subject: [PATCH 30/85] First pass of rebranding command --- composer.json | 14 ++++++++++---- src/bundle/Command/CreateExampleDataCommand.php | 8 +++++--- .../Command/CreateExampleDataManagerCommand.php | 6 ++++-- src/bundle/Command/CreateLanguageCommand.php | 4 +++- src/bundle/Command/GetPullRequestDataCommand.php | 4 +++- src/bundle/Command/TestSiteaccessCommand.php | 4 +++- src/bundle/Controller/ExceptionController.php | 4 +++- src/bundle/Controller/RenderController.php | 4 +++- .../Compiler/ElementFactoryCompilerPass.php | 6 ++++-- .../Compiler/FieldTypeDataProviderPass.php | 8 +++++--- .../Compiler/LimitationParserPass.php | 8 +++++--- ...ehatExtension.php => IbexaBehatExtension.php} | 6 ++++-- ...stemsBehatBundle.php => IbexaBehatBundle.php} | 12 +++++++----- .../{BehatExtension.php => IbexaExtension.php} | 8 +++++--- .../Initializer/BehatSiteAccessInitializer.php | 4 +++- src/bundle/Templating/Twig/PHPTypeExtension.php | 4 +++- src/lib/API/ContentData/ContentDataProvider.php | 6 ++++-- .../AbstractFieldTypeDataProvider.php | 6 ++++-- .../FieldTypeData/AuthorDataProvider.php | 4 +++- .../FieldTypeData/BinaryFileDataProvider.php | 4 +++- .../FieldTypeData/BooleanDataProvider.php | 6 ++++-- .../FieldTypeData/CountryDataProvider.php | 4 +++- .../FieldTypeData/DateDataProvider.php | 4 +++- .../FieldTypeData/DateTimeDataProvider.php | 4 +++- .../FieldTypeData/EmailDataProvider.php | 4 +++- .../FieldTypeDataProviderInterface.php | 4 +++- .../FieldTypeData/FloatDataProvider.php | 4 +++- .../FieldTypeData/ISBNDataProvider.php | 4 +++- .../FieldTypeData/ImageAssetDataProvider.php | 8 +++++--- .../FieldTypeData/ImageDataProvider.php | 6 ++++-- .../FieldTypeData/IntegerDataProvider.php | 4 +++- .../FieldTypeData/MapDataProvider.php | 4 +++- .../FieldTypeData/MatrixDataProvider.php | 6 ++++-- .../FieldTypeData/MediaDataProvider.php | 4 +++- .../FieldTypeData/ObjectRelationDataProvider.php | 8 +++++--- .../ObjectRelationListDataProvider.php | 4 +++- .../FieldTypeData/PasswordProvider.php | 4 +++- .../FieldTypeData/RichTextDataProvider.php | 8 +++++--- .../FieldTypeData/SelectionDataProvider.php | 4 +++- .../FieldTypeData/TextBlockDataProvider.php | 4 +++- .../FieldTypeData/TextLineDataProvider.php | 4 +++- .../FieldTypeData/TimeDataProvider.php | 4 +++- .../FieldTypeData/URLDataProvider.php | 4 +++- .../API/ContentData/FieldTypeNameConverter.php | 4 +++- src/lib/API/ContentData/RandomDataGenerator.php | 4 +++- src/lib/API/Context/ContentContext.php | 8 +++++--- src/lib/API/Context/ContentTypeContext.php | 6 ++++-- src/lib/API/Context/LanguageContext.php | 6 ++++-- .../ContentTypeLimitationParser.php | 4 +++- .../FieldGroupLimitationParser.php | 4 +++- .../LanguageLimitationParser.php | 4 +++- .../LimitationParserInterface.php | 4 +++- .../LimitationParsersCollector.php | 4 +++- .../LocationLimitationParser.php | 6 ++++-- .../NewSectionLimitationParser.php | 4 +++- .../NewStateLimitationParser.php | 4 +++- .../ObjectStateLimitationParser.php | 4 +++- .../LimitationParser/OwnerLimitationParser.php | 4 +++- .../ParentContentTypeLimitationParser.php | 4 +++- .../ParentDepthLimitationParser.php | 4 +++- .../ParentOwnerLimitationParser.php | 4 +++- .../ParentUserGroupLimitationParser.php | 4 +++- .../LimitationParser/SectionLimitationParser.php | 4 +++- .../SiteaccessLimitationParser.php | 4 +++- .../LimitationParser/SubtreeLimitationParser.php | 4 +++- .../UserGroupLimitationParser.php | 4 +++- .../WorkflowStageLimitationParser.php | 4 +++- .../WorkflowTransitionLimitationParser.php | 4 +++- src/lib/API/Context/ObjectStateContext.php | 4 +++- src/lib/API/Context/RoleContext.php | 8 +++++--- src/lib/API/Context/TestContext.php | 4 +++- src/lib/API/Context/TrashContext.php | 8 +++++--- src/lib/API/Context/UserContext.php | 8 +++++--- src/lib/API/Facade/ContentFacade.php | 6 ++++-- src/lib/API/Facade/ContentTypeFacade.php | 6 ++++-- src/lib/API/Facade/LanguageFacade.php | 4 +++- src/lib/API/Facade/RoleFacade.php | 6 ++++-- src/lib/API/Facade/SearchFacade.php | 4 +++- src/lib/API/Facade/TrashFacade.php | 4 +++- src/lib/API/Facade/UserFacade.php | 8 +++++--- src/lib/Core/Behat/ArgumentParser.php | 6 ++++-- src/lib/Core/Behat/TableNodeExtension.php | 4 +++- .../Core/Configuration/ConfigurationEditor.php | 4 +++- .../ConfigurationEditorInterface.php | 4 +++- .../LocationAwareConfigurationEditor.php | 6 ++++-- src/lib/Core/Context/ConfigurationContext.php | 6 ++++-- src/lib/Core/Context/FileContext.php | 4 +++- src/lib/Core/Context/TimeContext.php | 4 +++- src/lib/Core/Debug/Command/GoBackCommand.php | 4 +++- .../Core/Debug/Command/RefreshPageCommand.php | 4 +++- src/lib/Core/Debug/Command/ShowHTMLCommand.php | 4 +++- src/lib/Core/Debug/Command/ShowURLCommand.php | 4 +++- .../Core/Debug/Command/TakeScreenshotCommand.php | 4 +++- src/lib/Core/Debug/InteractiveDebuggerTrait.php | 16 +++++++++------- .../Matcher/ObjectFunctionCallChainMatcher.php | 4 +++- .../Debug/Matcher/ThisObjectMethodsMatcher.php | 4 +++- src/lib/Core/Debug/Shell/Shell.php | 8 +++++--- src/lib/Core/Log/LogFileReader.php | 4 +++- src/lib/Core/Log/TestLogProvider.php | 4 +++- src/lib/Event/Events.php | 4 +++- src/lib/Event/InitialEvent.php | 4 +++- src/lib/Event/TransitionEvent.php | 4 +++- src/lib/QueryType/FoldersUnderMediaQueryType.php | 4 +++- src/lib/Subscriber/AbstractProcessStage.php | 8 +++++--- src/lib/Subscriber/CreateContentDraft.php | 12 +++++++----- src/lib/Subscriber/EditContent.php | 12 +++++++----- src/lib/Subscriber/InitialStage.php | 14 ++++++++------ src/lib/Subscriber/PublishDraft.php | 10 ++++++---- src/lib/Subscriber/PublishInTheFuture.php | 10 ++++++---- src/lib/Subscriber/Review.php | 12 +++++++----- tests/{ => lib}/Browser/Element/BaseTestCase.php | 4 +++- .../Condition/ElementExistsConditionTest.php | 6 ++++-- .../Condition/ElementNotExistsConditionTest.php | 6 ++++-- .../ElementTransitionHasEndedConditionTest.php | 6 ++++-- .../Condition/ElementsCountConditionTest.php | 6 ++++-- .../ElementsCountGreaterThanConditionTest.php | 6 ++++-- .../Criterion/ChildElementTextCriterionTest.php | 6 ++++-- .../Criterion/ElementAttributeCriterionTest.php | 6 ++++-- .../Criterion/ElementTextCriterionTest.php | 6 ++++-- .../ElementTextFragmentCriterionTest.php | 6 ++++-- .../Element/Criterion/LogicalOrCriterionTest.php | 6 ++++-- .../Assert/Interactive/CollectionAssertTest.php | 4 +++- .../Assert/Interactive/ElementAssertTest.php | 4 +++- .../Element/Debug/HighlightingElementTest.php | 4 +++- .../Element/Debug/InteractiveElementTest.php | 4 +++- .../Browser/Element/ElementCollectionTest.php | 4 +++- tests/{ => lib}/Browser/Element/ElementTest.php | 4 +++- .../Element/Mapper/TextMapperTestCase.php | 6 ++++-- .../Browser/Filter/BrowserLogFilterTest.php | 4 +++- .../{ => lib}/Core/Behat/ArgumentParserTest.php | 8 +++++--- .../Core/Behat/ExtendedTableNodeTest.php | 6 ++++-- .../Configuration/ConfigurationEditorTest.php | 6 ++++-- .../LocationAwareConfigurationEditorTest.php | 10 ++++++---- tests/{ => lib}/Core/Log/LogFileReaderTest.php | 6 ++++-- 134 files changed, 506 insertions(+), 234 deletions(-) rename src/bundle/DependencyInjection/{eZBehatExtension.php => IbexaBehatExtension.php} (90%) rename src/bundle/{EzSystemsBehatBundle.php => IbexaBehatBundle.php} (62%) rename src/bundle/{BehatExtension.php => IbexaExtension.php} (96%) rename tests/{ => lib}/Browser/Element/BaseTestCase.php (95%) rename tests/{ => lib}/Browser/Element/Condition/ElementExistsConditionTest.php (86%) rename tests/{ => lib}/Browser/Element/Condition/ElementNotExistsConditionTest.php (87%) rename tests/{ => lib}/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php (92%) rename tests/{ => lib}/Browser/Element/Condition/ElementsCountConditionTest.php (87%) rename tests/{ => lib}/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php (86%) rename tests/{ => lib}/Browser/Element/Criterion/ChildElementTextCriterionTest.php (92%) rename tests/{ => lib}/Browser/Element/Criterion/ElementAttributeCriterionTest.php (91%) rename tests/{ => lib}/Browser/Element/Criterion/ElementTextCriterionTest.php (88%) rename tests/{ => lib}/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php (88%) rename tests/{ => lib}/Browser/Element/Criterion/LogicalOrCriterionTest.php (88%) rename tests/{ => lib}/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php (77%) rename tests/{ => lib}/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php (77%) rename tests/{ => lib}/Browser/Element/Debug/HighlightingElementTest.php (80%) rename tests/{ => lib}/Browser/Element/Debug/InteractiveElementTest.php (79%) rename tests/{ => lib}/Browser/Element/ElementCollectionTest.php (97%) rename tests/{ => lib}/Browser/Element/ElementTest.php (98%) rename tests/{ => lib}/Browser/Element/Mapper/TextMapperTestCase.php (77%) rename tests/{ => lib}/Browser/Filter/BrowserLogFilterTest.php (93%) rename tests/{ => lib}/Core/Behat/ArgumentParserTest.php (88%) rename tests/{ => lib}/Core/Behat/ExtendedTableNodeTest.php (94%) rename tests/{ => lib}/Core/Configuration/ConfigurationEditorTest.php (97%) rename tests/{ => lib}/Core/Configuration/LocationAwareConfigurationEditorTest.php (88%) rename tests/{ => lib}/Core/Log/LogFileReaderTest.php (91%) diff --git a/composer.json b/composer.json index dd8bc3b0..a04f69bf 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "ezsystems/behatbundle", + "name": "ibexa/behat", "description": "Behat bundle for help testing eZ Bundles and projects", "license": "GPL-2.0", "authors": [ @@ -53,8 +53,11 @@ "psr-4": { "EzSystems\\BehatBundle\\": "src/bundle/", "EzSystems\\Behat\\": "src/lib/", + "Ibexa\\Tests\\Behat\\": "tests/lib/", + "Ibexa\\Behat\\": "src/lib/", "Ibexa\\Bundle\\Behat\\": "src/bundle/", - "Ibexa\\Behat\\": "src/lib/" + "Ibexa\\Contracts\\Behat\\": "src/contracts/", + "Ibexa\\Tests\\Bundle\\Behat\\": "tests/bundle/" } }, "autoload-dev": { @@ -69,10 +72,13 @@ }, "extra": { "branch-alias": { - "dev-master": "9.0.x-dev" + "dev-main": "4.0.x-dev" } }, - "bin": ["bin/ezbehat", "bin/ezreport"], + "bin": [ + "bin/ezbehat", + "bin/ezreport" + ], "config": { "allow-plugins": { "composer/package-versions-deprecated": true diff --git a/src/bundle/Command/CreateExampleDataCommand.php b/src/bundle/Command/CreateExampleDataCommand.php index 653a1152..32f61eee 100644 --- a/src/bundle/Command/CreateExampleDataCommand.php +++ b/src/bundle/Command/CreateExampleDataCommand.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Command; +namespace Ibexa\Bundle\Behat\Command; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\InitialEvent; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\InitialEvent; use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -95,3 +95,5 @@ public function getDeprecatedAliases(): array return ['ezplatform:tools:create-data']; } } + +class_alias(CreateExampleDataCommand::class, 'EzSystems\BehatBundle\Command\CreateExampleDataCommand'); diff --git a/src/bundle/Command/CreateExampleDataManagerCommand.php b/src/bundle/Command/CreateExampleDataManagerCommand.php index 10e797a4..948a6ba0 100644 --- a/src/bundle/Command/CreateExampleDataManagerCommand.php +++ b/src/bundle/Command/CreateExampleDataManagerCommand.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Command; +namespace Ibexa\Bundle\Behat\Command; -use EzSystems\Behat\Event\InitialEvent; +use Ibexa\Behat\Event\InitialEvent; use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -167,3 +167,5 @@ public function getDeprecatedAliases(): array return ['ezplatform:tools:generate-items']; } } + +class_alias(CreateExampleDataManagerCommand::class, 'EzSystems\BehatBundle\Command\CreateExampleDataManagerCommand'); diff --git a/src/bundle/Command/CreateLanguageCommand.php b/src/bundle/Command/CreateLanguageCommand.php index f62c36b5..0b046e54 100644 --- a/src/bundle/Command/CreateLanguageCommand.php +++ b/src/bundle/Command/CreateLanguageCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Command; +namespace Ibexa\Bundle\Behat\Command; use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Ibexa\Contracts\Core\Repository\LanguageService; @@ -83,3 +83,5 @@ protected function execute(InputInterface $input, OutputInterface $output): int return 0; } } + +class_alias(CreateLanguageCommand::class, 'EzSystems\BehatBundle\Command\CreateLanguageCommand'); diff --git a/src/bundle/Command/GetPullRequestDataCommand.php b/src/bundle/Command/GetPullRequestDataCommand.php index 7ee53bef..2157aa73 100644 --- a/src/bundle/Command/GetPullRequestDataCommand.php +++ b/src/bundle/Command/GetPullRequestDataCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Command; +namespace Ibexa\Bundle\Behat\Command; use GuzzleHttp\Psr7\Request; use Http\Client\Common\HttpMethodsClient; @@ -199,3 +199,5 @@ public function getDeprecatedAliases(): array return ['ezplatform:tools:get-pull-request-data']; } } + +class_alias(GetPullRequestDataCommand::class, 'EzSystems\BehatBundle\Command\GetPullRequestDataCommand'); diff --git a/src/bundle/Command/TestSiteaccessCommand.php b/src/bundle/Command/TestSiteaccessCommand.php index 0f2571c4..3530df02 100644 --- a/src/bundle/Command/TestSiteaccessCommand.php +++ b/src/bundle/Command/TestSiteaccessCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Command; +namespace Ibexa\Bundle\Behat\Command; use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand; use Ibexa\Core\MVC\Symfony\SiteAccess; @@ -50,3 +50,5 @@ protected function execute(InputInterface $input, OutputInterface $output): int return 0; } } + +class_alias(TestSiteaccessCommand::class, 'EzSystems\BehatBundle\Command\TestSiteaccessCommand'); diff --git a/src/bundle/Controller/ExceptionController.php b/src/bundle/Controller/ExceptionController.php index 20a71375..7f05f516 100644 --- a/src/bundle/Controller/ExceptionController.php +++ b/src/bundle/Controller/ExceptionController.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Controller; +namespace Ibexa\Bundle\Behat\Controller; use Ibexa\Core\Base\Exceptions\UnauthorizedException; @@ -17,3 +17,5 @@ public function throwRepositoryUnauthorizedAction($module = 'foo', $function = ' throw new UnauthorizedException($module, $function, $properties); } } + +class_alias(ExceptionController::class, 'EzSystems\BehatBundle\Controller\ExceptionController'); diff --git a/src/bundle/Controller/RenderController.php b/src/bundle/Controller/RenderController.php index 3b1cb89a..63cab0f2 100644 --- a/src/bundle/Controller/RenderController.php +++ b/src/bundle/Controller/RenderController.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Controller; +namespace Ibexa\Bundle\Behat\Controller; use Ibexa\Bundle\Core\Controller; use Ibexa\Contracts\Core\Repository\ContentService; @@ -37,3 +37,5 @@ public function longAction(ContentView $view): ContentView return $view; } } + +class_alias(RenderController::class, 'EzSystems\BehatBundle\Controller\RenderController'); diff --git a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php index d0588118..4e755feb 100644 --- a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php +++ b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\DependencyInjection\Compiler; +namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; -use EzSystems\BehatBundle\DependencyInjection\eZBehatExtension; +use Ibexa\Bundle\Behat\DependencyInjection\IbexaBehatExtension; use Ibexa\Behat\Browser\Element\Factory\Debug\Interactive\ElementFactory; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -36,3 +36,5 @@ private function shouldEnableInteractiveDebug(ContainerBuilder $container): bool $container->getParameter(eZBehatExtension::BROWSER_DEBUG_INTERACTIVE_ENABLED); } } + +class_alias(ElementFactoryCompilerPass::class, 'EzSystems\BehatBundle\DependencyInjection\Compiler\ElementFactoryCompilerPass'); diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php index 854a30e1..25ed1573 100644 --- a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php +++ b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\DependencyInjection\Compiler; +namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; -use EzSystems\Behat\API\ContentData\ContentDataProvider; -use EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; +use Ibexa\Behat\API\ContentData\ContentDataProvider; +use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; @@ -29,3 +29,5 @@ public function process(ContainerBuilder $container) } } } + +class_alias(FieldTypeDataProviderPass::class, 'EzSystems\BehatBundle\DependencyInjection\Compiler\FieldTypeDataProviderPass'); diff --git a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php index c229ab51..d4de9e61 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\DependencyInjection\Compiler; +namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; -use EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface; -use EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector; +use Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface; +use Ibexa\Behat\API\Context\LimitationParser\LimitationParsersCollector; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; @@ -29,3 +29,5 @@ public function process(ContainerBuilder $container) } } } + +class_alias(LimitationParserPass::class, 'EzSystems\BehatBundle\DependencyInjection\Compiler\LimitationParserPass'); diff --git a/src/bundle/DependencyInjection/eZBehatExtension.php b/src/bundle/DependencyInjection/IbexaBehatExtension.php similarity index 90% rename from src/bundle/DependencyInjection/eZBehatExtension.php rename to src/bundle/DependencyInjection/IbexaBehatExtension.php index cda14861..8e16dae2 100644 --- a/src/bundle/DependencyInjection/eZBehatExtension.php +++ b/src/bundle/DependencyInjection/IbexaBehatExtension.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\DependencyInjection; +namespace Ibexa\Bundle\Behat\DependencyInjection; use Ibexa\Behat\Browser\Component\Component; use Ibexa\Behat\Browser\Page\PageInterface; @@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -class eZBehatExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface +class IbexaBehatExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface { private const OVERRIDE_CONFIGURATION = 'ibexa.testing.override_configuration'; @@ -71,3 +71,5 @@ private function shouldLoadDxpServices(ContainerBuilder $container) return isset($bundles['EzPlatformPageBuilderBundle'], $bundles['EzPlatformWorkflowBundle']); } } + +class_alias(IbexaBehatExtension::class, 'EzSystems\BehatBundle\DependencyInjection\eZBehatExtension'); diff --git a/src/bundle/EzSystemsBehatBundle.php b/src/bundle/IbexaBehatBundle.php similarity index 62% rename from src/bundle/EzSystemsBehatBundle.php rename to src/bundle/IbexaBehatBundle.php index 1826839f..5d329240 100644 --- a/src/bundle/EzSystemsBehatBundle.php +++ b/src/bundle/IbexaBehatBundle.php @@ -6,15 +6,15 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle; +namespace Ibexa\Bundle\Behat; -use EzSystems\BehatBundle\DependencyInjection\Compiler\ElementFactoryCompilerPass; -use EzSystems\BehatBundle\DependencyInjection\Compiler\FieldTypeDataProviderPass; -use EzSystems\BehatBundle\DependencyInjection\Compiler\LimitationParserPass; +use Ibexa\Bundle\Behat\DependencyInjection\Compiler\ElementFactoryCompilerPass; +use Ibexa\Bundle\Behat\DependencyInjection\Compiler\FieldTypeDataProviderPass; +use Ibexa\Bundle\Behat\DependencyInjection\Compiler\LimitationParserPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; -class EzSystemsBehatBundle extends Bundle +class IbexaBehatBundle extends Bundle { protected $name = 'eZBehatBundle'; @@ -25,3 +25,5 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new ElementFactoryCompilerPass()); } } + +class_alias(IbexaBehatBundle::class, 'EzSystems\BehatBundle\EzSystemsBehatBundle'); diff --git a/src/bundle/BehatExtension.php b/src/bundle/IbexaExtension.php similarity index 96% rename from src/bundle/BehatExtension.php rename to src/bundle/IbexaExtension.php index 08f10f48..ef14050e 100644 --- a/src/bundle/BehatExtension.php +++ b/src/bundle/IbexaExtension.php @@ -6,14 +6,14 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle; +namespace Ibexa\Bundle\Behat; use Behat\Behat\EventDispatcher\ServiceContainer\EventDispatcherExtension; use Behat\Mink\Driver\Selenium2Driver; use Behat\Testwork\ServiceContainer\Extension; use Behat\Testwork\ServiceContainer\ExtensionManager; use DMore\ChromeDriver\ChromeDriver; -use EzSystems\BehatBundle\Initializer\BehatSiteAccessInitializer; +use Ibexa\Bundle\Behat\Initializer\BehatSiteAccessInitializer; use FriendsOfBehat\SymfonyExtension\ServiceContainer\SymfonyExtension; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\FileLocator; @@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\Reference; -class BehatExtension implements Extension +class IbexaExtension implements Extension { private const MINK_BASE_URL_PARAMETER = 'ibexa.platform.behat.mink.base_url'; @@ -171,3 +171,5 @@ private function getDriverDefinitions(ContainerBuilder $container): array }, $registerSessionCalls); } } + +class_alias(IbexaExtension::class, 'EzSystems\BehatBundle\BehatExtension'); diff --git a/src/bundle/Initializer/BehatSiteAccessInitializer.php b/src/bundle/Initializer/BehatSiteAccessInitializer.php index 7838eaf5..1d45f29a 100644 --- a/src/bundle/Initializer/BehatSiteAccessInitializer.php +++ b/src/bundle/Initializer/BehatSiteAccessInitializer.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Initializer; +namespace Ibexa\Bundle\Behat\Initializer; use Behat\Behat\EventDispatcher\Event\ExampleTested; use Behat\Behat\EventDispatcher\Event\ScenarioTested; @@ -59,3 +59,5 @@ private function getSiteAccess(): SiteAccess return new SiteAccess($siteAccessName, 'cli'); } } + +class_alias(BehatSiteAccessInitializer::class, 'EzSystems\BehatBundle\Initializer\BehatSiteAccessInitializer'); diff --git a/src/bundle/Templating/Twig/PHPTypeExtension.php b/src/bundle/Templating/Twig/PHPTypeExtension.php index 7eaf4864..b8b370fe 100644 --- a/src/bundle/Templating/Twig/PHPTypeExtension.php +++ b/src/bundle/Templating/Twig/PHPTypeExtension.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\BehatBundle\Templating\Twig; +namespace Ibexa\Bundle\Behat\Templating\Twig; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; @@ -28,3 +28,5 @@ public function getFilters() ]; } } + +class_alias(PHPTypeExtension::class, 'EzSystems\BehatBundle\Templating\Twig\PHPTypeExtension'); diff --git a/src/lib/API/ContentData/ContentDataProvider.php b/src/lib/API/ContentData/ContentDataProvider.php index 68ac5690..2bbaae13 100644 --- a/src/lib/API/ContentData/ContentDataProvider.php +++ b/src/lib/API/ContentData/ContentDataProvider.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData; +namespace Ibexa\Behat\API\ContentData; -use EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; +use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct; @@ -116,3 +116,5 @@ private function fillContentStructWithData(ContentType $contentType, string $mai return $contentStruct; } } + +class_alias(ContentDataProvider::class, 'EzSystems\Behat\API\ContentData\ContentDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php index 972da8fd..8d09b0cc 100644 --- a/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Faker\Generator; abstract class AbstractFieldTypeDataProvider implements FieldTypeDataProviderInterface @@ -35,3 +35,5 @@ protected function getFaker(): Generator return $this->randomDataGenerator->getFaker(); } } + +class_alias(AbstractFieldTypeDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\AbstractFieldTypeDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php b/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php index 3024d51f..8d89b3b6 100644 --- a/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/AuthorDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\Author\Author; use Ibexa\Core\FieldType\Author\Value; @@ -45,3 +45,5 @@ private function getSingleAuthor(string $language = 'eng-GB'): Author return $author; } } + +class_alias(AuthorDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\AuthorDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php b/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php index df805cd4..6527b9a8 100644 --- a/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/BinaryFileDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\BinaryFile\Value; @@ -45,3 +45,5 @@ public function parseFromString(string $value) return new Value(['inputUri' => $filePath]); } } + +class_alias(BinaryFileDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\BinaryFileDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php index 7946c891..5f395af7 100644 --- a/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/BooleanDataProvider.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Ibexa\Contracts\Core\Repository\ContentTypeService; class BooleanDataProvider extends AbstractFieldTypeDataProvider @@ -43,3 +43,5 @@ public function parseFromString(string $value) return 'true' === strtolower($value); } } + +class_alias(BooleanDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\BooleanDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php b/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php index c4a565b9..807b401d 100644 --- a/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/CountryDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\Country\Value; @@ -44,3 +44,5 @@ public function parseFromString(string $value) return new Value([$value => self::COUNTRY_DATA[$value]]); } } + +class_alias(CountryDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\CountryDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php b/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php index a77fbc68..e8caee8a 100644 --- a/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/DateDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use DateTime; use Ibexa\Core\FieldType\Date\Value; @@ -28,3 +28,5 @@ public function parseFromString(string $value) return DateTime::createFromFormat('Y-m-d', $value); } } + +class_alias(DateDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\DateDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php index 8269d472..f05867cb 100644 --- a/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/DateTimeDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use DateTime; use Ibexa\Core\FieldType\DateAndTime\Value; @@ -28,3 +28,5 @@ public function parseFromString(string $value) return DateTime::createFromFormat('Y-m-d H:i:s', $value); } } + +class_alias(DateTimeDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\DateTimeDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/EmailDataProvider.php b/src/lib/API/ContentData/FieldTypeData/EmailDataProvider.php index a224856f..2d9e18ee 100644 --- a/src/lib/API/ContentData/FieldTypeData/EmailDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/EmailDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class EmailDataProvider extends AbstractFieldTypeDataProvider { @@ -22,3 +22,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return $this->getFaker()->companyEmail; } } + +class_alias(EmailDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\EmailDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php b/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php index 70741976..84891485 100644 --- a/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php +++ b/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; interface FieldTypeDataProviderInterface { @@ -18,3 +18,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif public function parseFromString(string $value); } + +class_alias(FieldTypeDataProviderInterface::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface'); diff --git a/src/lib/API/ContentData/FieldTypeData/FloatDataProvider.php b/src/lib/API/ContentData/FieldTypeData/FloatDataProvider.php index 12e8c309..097451e0 100644 --- a/src/lib/API/ContentData/FieldTypeData/FloatDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/FloatDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class FloatDataProvider extends AbstractFieldTypeDataProvider { @@ -25,3 +25,5 @@ public function parseFromString(string $value) return (float) $value; } } + +class_alias(FloatDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\FloatDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/ISBNDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ISBNDataProvider.php index 32f507a7..1fdd45df 100644 --- a/src/lib/API/ContentData/FieldTypeData/ISBNDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ISBNDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class ISBNDataProvider extends AbstractFieldTypeDataProvider { @@ -20,3 +20,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return $this->getFaker()->isbn13; } } + +class_alias(ISBNDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\ISBNDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php index 57a9dbca..7f46a7f7 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; @@ -99,3 +99,5 @@ public function parseFromString(string $value) return new Value($location->getContentInfo()->id, $this->getFaker()->realText(100)); } } + +class_alias(ImageAssetDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\ImageAssetDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php index e9b37dae..a6ff7111 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageDataProvider.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Ibexa\Core\FieldType\Image\Value; class ImageDataProvider extends AbstractFieldTypeDataProvider @@ -70,3 +70,5 @@ public function parseFromString(string $value) ); } } + +class_alias(ImageDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\ImageDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/IntegerDataProvider.php b/src/lib/API/ContentData/FieldTypeData/IntegerDataProvider.php index c7ff1e34..fccd9302 100644 --- a/src/lib/API/ContentData/FieldTypeData/IntegerDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/IntegerDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class IntegerDataProvider extends AbstractFieldTypeDataProvider { @@ -25,3 +25,5 @@ public function parseFromString(string $value) return (int) $value; } } + +class_alias(IntegerDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\IntegerDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php index 547ba81d..8a7458e8 100644 --- a/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MapDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\MapLocation\Value; @@ -50,3 +50,5 @@ public function parseFromString(string $value) return new Value(self::LOCATION_DATA[$value]); } } + +class_alias(MapDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\MapDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php index a075cbb2..b022f0c3 100644 --- a/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MatrixDataProvider.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\FieldTypeMatrix\FieldType\Value; use Ibexa\FieldTypeMatrix\FieldType\Value\Row; @@ -92,3 +92,5 @@ private function getRandomEntry($columnIdentifiers) return new Row($values); } } + +class_alias(MatrixDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\MatrixDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php b/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php index 4740509d..6dc86d4b 100644 --- a/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/MediaDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\Media\Value; @@ -55,3 +55,5 @@ public function parseFromString(string $value) return $mediaValue; } } + +class_alias(MediaDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\MediaDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php index 5fb2c56a..63dd90b7 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\Facade\SearchFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\SearchFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; @@ -66,3 +66,5 @@ protected function getContentID(string $locationPath) return $location->getContentInfo()->id; } } + +class_alias(ObjectRelationDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php index d9543959..171db2c0 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationListDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Core\FieldType\RelationList\Value; @@ -32,3 +32,5 @@ public function parseFromString(string $value) return new Value($itemsToAdd); } } + +class_alias(ObjectRelationListDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationListDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/PasswordProvider.php b/src/lib/API/ContentData/FieldTypeData/PasswordProvider.php index 4434810a..f055b486 100644 --- a/src/lib/API/ContentData/FieldTypeData/PasswordProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/PasswordProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class PasswordProvider extends AbstractFieldTypeDataProvider { @@ -22,3 +22,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return self::DEFAUlT_PASSWORD; } } + +class_alias(PasswordProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php index f3ded389..a1b5210c 100644 --- a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\API\Facade\SearchFacade; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\Facade\SearchFacade; class RichTextDataProvider extends AbstractFieldTypeDataProvider { @@ -62,3 +62,5 @@ public function parseFromString(string $value) return sprintf(self::SIMPLE_RICHTEXT_XML, $value); } } + +class_alias(RichTextDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\RichTextDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php b/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php index d8908cc2..844a6002 100644 --- a/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/SelectionDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Core\FieldType\Selection\Value; @@ -50,3 +50,5 @@ public function parseFromString(string $value) return new Value($options); } } + +class_alias(SelectionDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\SelectionDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/TextBlockDataProvider.php b/src/lib/API/ContentData/FieldTypeData/TextBlockDataProvider.php index 89a2566d..73658cda 100644 --- a/src/lib/API/ContentData/FieldTypeData/TextBlockDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/TextBlockDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class TextBlockDataProvider extends AbstractFieldTypeDataProvider { @@ -22,3 +22,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return $this->getFaker()->paragraphs(5, true); } } + +class_alias(TextBlockDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\TextBlockDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php b/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php index 4963e0f9..778067ce 100644 --- a/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class TextLineDataProvider extends AbstractFieldTypeDataProvider { @@ -22,3 +22,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return $this->getFaker()->realText(80, 1); } } + +class_alias(TextLineDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\TextLineDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php index b32fc9a4..111ed15c 100644 --- a/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/TimeDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; use DateTime; use Ibexa\Core\FieldType\Time\Value; @@ -28,3 +28,5 @@ public function parseFromString(string $value) return Value::fromDateTime(DateTime::createFromFormat('H:i:s', $value)); } } + +class_alias(TimeDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\TimeDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeData/URLDataProvider.php b/src/lib/API/ContentData/FieldTypeData/URLDataProvider.php index ce1c1db4..d0acab39 100644 --- a/src/lib/API/ContentData/FieldTypeData/URLDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/URLDataProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData\FieldTypeData; +namespace Ibexa\Behat\API\ContentData\FieldTypeData; class URLDataProvider extends AbstractFieldTypeDataProvider { @@ -20,3 +20,5 @@ public function generateData(string $contentTypeIdentifier, string $fieldIdentif return $this->getFaker()->url; } } + +class_alias(URLDataProvider::class, 'EzSystems\Behat\API\ContentData\FieldTypeData\URLDataProvider'); diff --git a/src/lib/API/ContentData/FieldTypeNameConverter.php b/src/lib/API/ContentData/FieldTypeNameConverter.php index bc5afe7b..337b22eb 100644 --- a/src/lib/API/ContentData/FieldTypeNameConverter.php +++ b/src/lib/API/ContentData/FieldTypeNameConverter.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData; +namespace Ibexa\Behat\API\ContentData; class FieldTypeNameConverter { @@ -53,3 +53,5 @@ public static function getFieldTypeIdentifierByName(string $fieldTypeName): stri return array_search($fieldTypeName, static::$FIELD_TYPE_MAPPING); } } + +class_alias(FieldTypeNameConverter::class, 'EzSystems\Behat\API\ContentData\FieldTypeNameConverter'); diff --git a/src/lib/API/ContentData/RandomDataGenerator.php b/src/lib/API/ContentData/RandomDataGenerator.php index 3fd073a5..76570e83 100644 --- a/src/lib/API/ContentData/RandomDataGenerator.php +++ b/src/lib/API/ContentData/RandomDataGenerator.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\ContentData; +namespace Ibexa\Behat\API\ContentData; use DateTime; use Faker; @@ -69,3 +69,5 @@ public function getRandomProbability(): float return random_int(0, 999) / 1000; } } + +class_alias(RandomDataGenerator::class, 'EzSystems\Behat\API\ContentData\RandomDataGenerator'); diff --git a/src/lib/API/Context/ContentContext.php b/src/lib/API/Context/ContentContext.php index 6ab56b15..7c25aed9 100644 --- a/src/lib/API/Context/ContentContext.php +++ b/src/lib/API/Context/ContentContext.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\API\Facade\ContentFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\ContentFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; class ContentContext implements Context { @@ -131,3 +131,5 @@ private function parseData(TableNode $contentItemData) return $contentItemData->getHash(); } } + +class_alias(ContentContext::class, 'EzSystems\Behat\API\Context\ContentContext'); diff --git a/src/lib/API/Context/ContentTypeContext.php b/src/lib/API/Context/ContentTypeContext.php index 86f12d14..8e549304 100644 --- a/src/lib/API/Context/ContentTypeContext.php +++ b/src/lib/API/Context/ContentTypeContext.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\API\Facade\ContentTypeFacade; +use Ibexa\Behat\API\Facade\ContentTypeFacade; use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; class ContentTypeContext implements Context @@ -142,3 +142,5 @@ private function parseContentQuerySettings(string $settings): array return $parsedSettings; } } + +class_alias(ContentTypeContext::class, 'EzSystems\Behat\API\Context\ContentTypeContext'); diff --git a/src/lib/API/Context/LanguageContext.php b/src/lib/API/Context/LanguageContext.php index 3b624d62..b5c5e1ee 100644 --- a/src/lib/API/Context/LanguageContext.php +++ b/src/lib/API/Context/LanguageContext.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; -use EzSystems\Behat\API\Facade\LanguageFacade; +use Ibexa\Behat\API\Facade\LanguageFacade; class LanguageContext implements Context { @@ -31,3 +31,5 @@ public function createLanguageIfNotExists(string $name, string $languageCode) $this->languageFacade->createLanguageIfNotExists($name, $languageCode); } } + +class_alias(LanguageContext::class, 'EzSystems\Behat\API\Context\LanguageContext'); diff --git a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php index 5b353e62..a23e2d0b 100644 --- a/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ContentTypeLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -64,3 +64,5 @@ private function parseCommonContentTypes(string $contentTypeName): string return $contentTypeName; } } + +class_alias(ContentTypeLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ContentTypeLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php index e8605d37..3f45c3a3 100644 --- a/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/FieldGroupLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Permissions\Repository\Values\User\Limitation\FieldGroupLimitation; @@ -27,3 +27,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(FieldGroupLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\FieldGroupLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php b/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php index de6d8358..091203d4 100644 --- a/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LanguageLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation; @@ -25,3 +25,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(LanguageLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\LanguageLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php index 9e8b8fe5..02d0f3e8 100644 --- a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php +++ b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -18,3 +18,5 @@ public function supports(string $limitationType): bool; public function parse(string $limitationValues): Limitation; } + +class_alias(LimitationParserInterface::class, 'EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface'); diff --git a/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php b/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php index 45314e6a..0cc36eca 100644 --- a/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php +++ b/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; class LimitationParsersCollector { @@ -34,3 +34,5 @@ public function getLimitationParsers(): array return $this->limitationParsers; } } + +class_alias(LimitationParsersCollector::class, 'EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector'); diff --git a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php index 1a76da7f..b9cc524a 100644 --- a/src/lib/API/Context/LimitationParser/LocationLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/LocationLimitationParser.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\Core\Behat\ArgumentParser; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; @@ -56,3 +56,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(LocationLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\LocationLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php b/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php index 038a6f40..6d58b4b3 100644 --- a/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/NewSectionLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\SectionService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -43,3 +43,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(NewSectionLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\NewSectionLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php b/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php index 25f2c9a1..e1b93521 100644 --- a/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/NewStateLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\ObjectStateService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -60,3 +60,5 @@ protected function parseObjectStateValues($objectStates) return $values; } } + +class_alias(NewStateLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\NewStateLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php b/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php index b69304e4..dd7c86e7 100644 --- a/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ObjectStateLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation; @@ -27,3 +27,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(ObjectStateLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ObjectStateLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php b/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php index cc0f2e47..591dc3ec 100644 --- a/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/OwnerLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation; @@ -30,3 +30,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(OwnerLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\OwnerLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php index fbe79711..48310e3e 100644 --- a/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentContentTypeLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation; @@ -26,3 +26,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(ParentContentTypeLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ParentContentTypeLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php index 687b0c57..46402d3e 100644 --- a/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentDepthLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -25,3 +25,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(ParentDepthLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ParentDepthLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php index 7681d6c1..2fc8e028 100644 --- a/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentOwnerLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation; @@ -31,3 +31,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(ParentOwnerLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ParentOwnerLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php index f790d814..57ff5710 100644 --- a/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/ParentUserGroupLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation; @@ -31,3 +31,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(ParentUserGroupLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\ParentUserGroupLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/SectionLimitationParser.php b/src/lib/API/Context/LimitationParser/SectionLimitationParser.php index 0cd95822..379f4a6b 100644 --- a/src/lib/API/Context/LimitationParser/SectionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SectionLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\SectionService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; @@ -43,3 +43,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(SectionLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\SectionLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php b/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php index 84549fc2..f7a31826 100644 --- a/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SiteaccessLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SiteAccessLimitation; @@ -32,3 +32,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(SiteaccessLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\SiteaccessLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php index 3df3cb39..baa7a381 100644 --- a/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/SubtreeLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; @@ -45,3 +45,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(SubtreeLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\SubtreeLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php b/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php index ba4138e3..81fa0c36 100644 --- a/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/UserGroupLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation; @@ -30,3 +30,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(UserGroupLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\UserGroupLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php b/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php index 469e747f..8a5537df 100644 --- a/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/WorkflowStageLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Workflow\Value\Limitation\WorkflowStageLimitation; @@ -27,3 +27,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(WorkflowStageLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\WorkflowStageLimitationParser'); diff --git a/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php b/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php index a21842ff..667cd4dc 100644 --- a/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php +++ b/src/lib/API/Context/LimitationParser/WorkflowTransitionLimitationParser.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context\LimitationParser; +namespace Ibexa\Behat\API\Context\LimitationParser; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Workflow\Value\Limitation\WorkflowTransitionLimitation; @@ -27,3 +27,5 @@ public function parse(string $limitationValues): Limitation ); } } + +class_alias(WorkflowTransitionLimitationParser::class, 'EzSystems\Behat\API\Context\LimitationParser\WorkflowTransitionLimitationParser'); diff --git a/src/lib/API/Context/ObjectStateContext.php b/src/lib/API/Context/ObjectStateContext.php index ae18e272..b4d7fe4a 100644 --- a/src/lib/API/Context/ObjectStateContext.php +++ b/src/lib/API/Context/ObjectStateContext.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; @@ -46,3 +46,5 @@ public function objectStateWithIdentifierExists(string $objectStateGroupName, st } } } + +class_alias(ObjectStateContext::class, 'EzSystems\Behat\API\Context\ObjectStateContext'); diff --git a/src/lib/API/Context/RoleContext.php b/src/lib/API/Context/RoleContext.php index 75700c2f..67b94f52 100644 --- a/src/lib/API/Context/RoleContext.php +++ b/src/lib/API/Context/RoleContext.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\API\Facade\RoleFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\RoleFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; class RoleContext implements Context { @@ -78,3 +78,5 @@ public function addPolicyToRoleWithLimitation(string $module, string $function, $this->roleFacade->addPolicyToRole($roleName, $module, $function, $parsedLimitations); } } + +class_alias(RoleContext::class, 'EzSystems\Behat\API\Context\RoleContext'); diff --git a/src/lib/API/Context/TestContext.php b/src/lib/API/Context/TestContext.php index 33d1e78e..c0d662dd 100644 --- a/src/lib/API/Context/TestContext.php +++ b/src/lib/API/Context/TestContext.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Behat\Hook\Scope\BeforeScenarioScope; @@ -57,3 +57,5 @@ public function loginAPIUser(BeforeScenarioScope $scope) } } } + +class_alias(TestContext::class, 'EzSystems\Behat\API\Context\TestContext'); diff --git a/src/lib/API/Context/TrashContext.php b/src/lib/API/Context/TrashContext.php index d8f04cc8..44058010 100644 --- a/src/lib/API/Context/TrashContext.php +++ b/src/lib/API/Context/TrashContext.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; -use EzSystems\Behat\API\Facade\TrashFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\TrashFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; class TrashContext implements Context { @@ -37,3 +37,5 @@ public function iSendToTheTrash($locationURL) $this->trashFacade->trash($locationURL); } } + +class_alias(TrashContext::class, 'EzSystems\Behat\API\Context\TrashContext'); diff --git a/src/lib/API/Context/UserContext.php b/src/lib/API/Context/UserContext.php index 1fda2880..75536a0b 100644 --- a/src/lib/API/Context/UserContext.php +++ b/src/lib/API/Context/UserContext.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Context; +namespace Ibexa\Behat\API\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\API\Facade\UserFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\UserFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; class UserContext implements Context { @@ -71,3 +71,5 @@ public function assignUserGroupToRole(string $userGroupName, string $roleName, T $this->userFacade->assignUserGroupToRole($userGroupName, $roleName, $roleLimitation); } } + +class_alias(UserContext::class, 'EzSystems\Behat\API\Context\UserContext'); diff --git a/src/lib/API/Facade/ContentFacade.php b/src/lib/API/Facade/ContentFacade.php index f7ea6278..aadde38d 100644 --- a/src/lib/API/Facade/ContentFacade.php +++ b/src/lib/API/Facade/ContentFacade.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; -use EzSystems\Behat\API\ContentData\ContentDataProvider; +use Ibexa\Behat\API\ContentData\ContentDataProvider; use FOS\HttpCacheBundle\CacheManager; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; @@ -129,3 +129,5 @@ private function flushHTTPcache(): void $this->cacheManager->flush(); } } + +class_alias(ContentFacade::class, 'EzSystems\Behat\API\Facade\ContentFacade'); diff --git a/src/lib/API/Facade/ContentTypeFacade.php b/src/lib/API/Facade/ContentTypeFacade.php index 72c40493..c4c90572 100644 --- a/src/lib/API/Facade/ContentTypeFacade.php +++ b/src/lib/API/Facade/ContentTypeFacade.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; -use EzSystems\Behat\API\ContentData\FieldTypeNameConverter; +use Ibexa\Behat\API\ContentData\FieldTypeNameConverter; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; @@ -114,3 +114,5 @@ private function assertContentTypeExistsInGroup(string $contentTypeIdentifier, C } } } + +class_alias(ContentTypeFacade::class, 'EzSystems\Behat\API\Facade\ContentTypeFacade'); diff --git a/src/lib/API/Facade/LanguageFacade.php b/src/lib/API/Facade/LanguageFacade.php index 0d6c7a46..0a0a155e 100644 --- a/src/lib/API/Facade/LanguageFacade.php +++ b/src/lib/API/Facade/LanguageFacade.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\LanguageService; @@ -39,3 +39,5 @@ public function createLanguage(string $name, string $languageCode) $this->languageService->createLanguage($languageCreateStruct); } } + +class_alias(LanguageFacade::class, 'EzSystems\Behat\API\Facade\LanguageFacade'); diff --git a/src/lib/API/Facade/RoleFacade.php b/src/lib/API/Facade/RoleFacade.php index 31684368..f3109af9 100644 --- a/src/lib/API/Facade/RoleFacade.php +++ b/src/lib/API/Facade/RoleFacade.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; -use EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector; +use Ibexa\Behat\API\Context\LimitationParser\LimitationParsersCollector; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\RoleService; @@ -69,3 +69,5 @@ public function getLimitationParsers(): array return $this->limitationParsersCollector->getLimitationParsers(); } } + +class_alias(RoleFacade::class, 'EzSystems\Behat\API\Facade\RoleFacade'); diff --git a/src/lib/API/Facade/SearchFacade.php b/src/lib/API/Facade/SearchFacade.php index 541ada15..96e995d2 100644 --- a/src/lib/API/Facade/SearchFacade.php +++ b/src/lib/API/Facade/SearchFacade.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; @@ -104,3 +104,5 @@ public function getRandomLocationID(): int return $this->contentService->loadContent($contentId)->contentInfo->mainLocationId; } } + +class_alias(SearchFacade::class, 'EzSystems\Behat\API\Facade\SearchFacade'); diff --git a/src/lib/API/Facade/TrashFacade.php b/src/lib/API/Facade/TrashFacade.php index 5140736e..1a737ce4 100644 --- a/src/lib/API/Facade/TrashFacade.php +++ b/src/lib/API/Facade/TrashFacade.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\TrashService; @@ -42,3 +42,5 @@ public function trash(string $locationURL) $this->trashService->trash($location); } } + +class_alias(TrashFacade::class, 'EzSystems\Behat\API\Facade\TrashFacade'); diff --git a/src/lib/API/Facade/UserFacade.php b/src/lib/API/Facade/UserFacade.php index 98167f9e..324f1886 100644 --- a/src/lib/API/Facade/UserFacade.php +++ b/src/lib/API/Facade/UserFacade.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\API\Facade; +namespace Ibexa\Behat\API\Facade; -use EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\ContentData\FieldTypeData\PasswordProvider; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\SearchService; @@ -149,3 +149,5 @@ private function loadLegacyUserGroupByName(string $userGroupName): UserGroup throw new NotFoundException('User Group', $userGroupName); } } + +class_alias(UserFacade::class, 'EzSystems\Behat\API\Facade\UserFacade'); diff --git a/src/lib/Core/Behat/ArgumentParser.php b/src/lib/Core/Behat/ArgumentParser.php index 6479908c..31cd92a1 100644 --- a/src/lib/Core/Behat/ArgumentParser.php +++ b/src/lib/Core/Behat/ArgumentParser.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Behat; +namespace Ibexa\Behat\Core\Behat; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\API\Facade\RoleFacade; +use Ibexa\Behat\API\Facade\RoleFacade; use Ibexa\Behat\Browser\Environment\ParameterProviderInterface; class ArgumentParser @@ -76,3 +76,5 @@ public function replaceRootKeyword(string $path): string return str_replace(self::ROOT_KEYWORD, $this->parameterProvider->getParameter('root_content_name'), $path); } } + +class_alias(ArgumentParser::class, 'EzSystems\Behat\Core\Behat\ArgumentParser'); diff --git a/src/lib/Core/Behat/TableNodeExtension.php b/src/lib/Core/Behat/TableNodeExtension.php index 49b88882..eba186eb 100644 --- a/src/lib/Core/Behat/TableNodeExtension.php +++ b/src/lib/Core/Behat/TableNodeExtension.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Behat; +namespace Ibexa\Behat\Core\Behat; use Behat\Gherkin\Node\TableNode; @@ -62,3 +62,5 @@ public static function removeColumn(TableNode $table, string $columnName): Table return new self($newTable); } } + +class_alias(TableNodeExtension::class, 'EzSystems\Behat\Core\Behat\TableNodeExtension'); diff --git a/src/lib/Core/Configuration/ConfigurationEditor.php b/src/lib/Core/Configuration/ConfigurationEditor.php index c48f0a9d..658e0231 100644 --- a/src/lib/Core/Configuration/ConfigurationEditor.php +++ b/src/lib/Core/Configuration/ConfigurationEditor.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Configuration; +namespace Ibexa\Behat\Core\Configuration; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\Yaml\Yaml; @@ -113,3 +113,5 @@ private function getNewValue($currentValue, $value, bool $appendToExisting) return array_merge($currentValue, $value); } } + +class_alias(ConfigurationEditor::class, 'EzSystems\Behat\Core\Configuration\ConfigurationEditor'); diff --git a/src/lib/Core/Configuration/ConfigurationEditorInterface.php b/src/lib/Core/Configuration/ConfigurationEditorInterface.php index 9d74d318..98a4570e 100644 --- a/src/lib/Core/Configuration/ConfigurationEditorInterface.php +++ b/src/lib/Core/Configuration/ConfigurationEditorInterface.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Configuration; +namespace Ibexa\Behat\Core\Configuration; interface ConfigurationEditorInterface { @@ -45,3 +45,5 @@ public function getConfigFromFile(string $filePath); */ public function saveConfigToFile($filePath, $config): void; } + +class_alias(ConfigurationEditorInterface::class, 'EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface'); diff --git a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php index 26549cec..3d1d2fbc 100644 --- a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php +++ b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Configuration; +namespace Ibexa\Behat\Core\Configuration; -use EzSystems\Behat\API\Facade\ContentFacade; +use Ibexa\Behat\API\Facade\ContentFacade; class LocationAwareConfigurationEditor implements ConfigurationEditorInterface { @@ -76,3 +76,5 @@ private function replaceSingleValue(&$value): void } } } + +class_alias(LocationAwareConfigurationEditor::class, 'EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor'); diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index e7ae8146..bdf793e4 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -6,13 +6,13 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Context; +namespace Ibexa\Behat\Core\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\PyStringNode; use Behat\Gherkin\Node\TableNode; use Exception; -use EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface; +use Ibexa\Behat\Core\Configuration\ConfigurationEditorInterface; use Symfony\Component\Yaml\Yaml; class ConfigurationContext implements Context @@ -155,3 +155,5 @@ private function shouldAppendValue(string $value): bool return 'append' === $value; } } + +class_alias(ConfigurationContext::class, 'EzSystems\Behat\Core\Context\ConfigurationContext'); diff --git a/src/lib/Core/Context/FileContext.php b/src/lib/Core/Context/FileContext.php index ef80610b..25b77375 100644 --- a/src/lib/Core/Context/FileContext.php +++ b/src/lib/Core/Context/FileContext.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Context; +namespace Ibexa\Behat\Core\Context; use Behat\Behat\Context\Context; use Behat\Gherkin\Node\PyStringNode; @@ -83,3 +83,5 @@ private function createDirectoryStructure($destinationPath): void } } } + +class_alias(FileContext::class, 'EzSystems\Behat\Core\Context\FileContext'); diff --git a/src/lib/Core/Context/TimeContext.php b/src/lib/Core/Context/TimeContext.php index de7776ce..1a7f1829 100644 --- a/src/lib/Core/Context/TimeContext.php +++ b/src/lib/Core/Context/TimeContext.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Context; +namespace Ibexa\Behat\Core\Context; use Behat\Behat\Context\Context; use PHPUnit\Framework\Assert; @@ -62,3 +62,5 @@ public function actionTookLongerThan(string $maxDuration): void Assert::assertGreaterThan($maxDuration, $actualDuration); } } + +class_alias(TimeContext::class, 'EzSystems\Behat\Core\Context\TimeContext'); diff --git a/src/lib/Core/Debug/Command/GoBackCommand.php b/src/lib/Core/Debug/Command/GoBackCommand.php index 12e09150..5a6c1c82 100644 --- a/src/lib/Core/Debug/Command/GoBackCommand.php +++ b/src/lib/Core/Debug/Command/GoBackCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Command; +namespace Ibexa\Behat\Core\Debug\Command; use Behat\Mink\Session; use Psy\Command\Command; @@ -42,3 +42,5 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } } + +class_alias(GoBackCommand::class, 'EzSystems\Behat\Core\Debug\Command\GoBackCommand'); diff --git a/src/lib/Core/Debug/Command/RefreshPageCommand.php b/src/lib/Core/Debug/Command/RefreshPageCommand.php index e04a99a8..51aae084 100644 --- a/src/lib/Core/Debug/Command/RefreshPageCommand.php +++ b/src/lib/Core/Debug/Command/RefreshPageCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Command; +namespace Ibexa\Behat\Core\Debug\Command; use Behat\Mink\Session; use Psy\Command\Command; @@ -42,3 +42,5 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } } + +class_alias(RefreshPageCommand::class, 'EzSystems\Behat\Core\Debug\Command\RefreshPageCommand'); diff --git a/src/lib/Core/Debug/Command/ShowHTMLCommand.php b/src/lib/Core/Debug/Command/ShowHTMLCommand.php index 1516596d..d64529ec 100644 --- a/src/lib/Core/Debug/Command/ShowHTMLCommand.php +++ b/src/lib/Core/Debug/Command/ShowHTMLCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Command; +namespace Ibexa\Behat\Core\Debug\Command; use Behat\Mink\Session; use Psy\Command\Command; @@ -40,3 +40,5 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } } + +class_alias(ShowHTMLCommand::class, 'EzSystems\Behat\Core\Debug\Command\ShowHTMLCommand'); diff --git a/src/lib/Core/Debug/Command/ShowURLCommand.php b/src/lib/Core/Debug/Command/ShowURLCommand.php index 9858e5a4..89fbcace 100644 --- a/src/lib/Core/Debug/Command/ShowURLCommand.php +++ b/src/lib/Core/Debug/Command/ShowURLCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Command; +namespace Ibexa\Behat\Core\Debug\Command; use Behat\Mink\Session; use Psy\Command\Command; @@ -40,3 +40,5 @@ protected function execute(InputInterface $input, OutputInterface $output) return 0; } } + +class_alias(ShowURLCommand::class, 'EzSystems\Behat\Core\Debug\Command\ShowURLCommand'); diff --git a/src/lib/Core/Debug/Command/TakeScreenshotCommand.php b/src/lib/Core/Debug/Command/TakeScreenshotCommand.php index e403452e..6e022844 100644 --- a/src/lib/Core/Debug/Command/TakeScreenshotCommand.php +++ b/src/lib/Core/Debug/Command/TakeScreenshotCommand.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Command; +namespace Ibexa\Behat\Core\Debug\Command; use Behat\Mink\Session; use Cloudinary; @@ -62,3 +62,5 @@ protected function execute(InputInterface $input, OutputInterface $output) } } } + +class_alias(TakeScreenshotCommand::class, 'EzSystems\Behat\Core\Debug\Command\TakeScreenshotCommand'); diff --git a/src/lib/Core/Debug/InteractiveDebuggerTrait.php b/src/lib/Core/Debug/InteractiveDebuggerTrait.php index 776fdcb1..d78e73f5 100644 --- a/src/lib/Core/Debug/InteractiveDebuggerTrait.php +++ b/src/lib/Core/Debug/InteractiveDebuggerTrait.php @@ -6,15 +6,15 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug; +namespace Ibexa\Behat\Core\Debug; use Exception; -use EzSystems\Behat\Core\Debug\Command\GoBackCommand; -use EzSystems\Behat\Core\Debug\Command\RefreshPageCommand; -use EzSystems\Behat\Core\Debug\Command\ShowHTMLCommand; -use EzSystems\Behat\Core\Debug\Command\ShowURLCommand; -use EzSystems\Behat\Core\Debug\Command\TakeScreenshotCommand; -use EzSystems\Behat\Core\Debug\Shell\Shell; +use Ibexa\Behat\Core\Debug\Command\GoBackCommand; +use Ibexa\Behat\Core\Debug\Command\RefreshPageCommand; +use Ibexa\Behat\Core\Debug\Command\ShowHTMLCommand; +use Ibexa\Behat\Core\Debug\Command\ShowURLCommand; +use Ibexa\Behat\Core\Debug\Command\TakeScreenshotCommand; +use Ibexa\Behat\Core\Debug\Shell\Shell; use Ibexa\Behat\Browser\Component\Component; use RuntimeException; @@ -123,3 +123,5 @@ private function addCommands(Shell $sh, Component $component): void ]); } } + +class_alias(InteractiveDebuggerTrait::class, 'EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait'); diff --git a/src/lib/Core/Debug/Matcher/ObjectFunctionCallChainMatcher.php b/src/lib/Core/Debug/Matcher/ObjectFunctionCallChainMatcher.php index 5d8eaa6e..1f5f1433 100644 --- a/src/lib/Core/Debug/Matcher/ObjectFunctionCallChainMatcher.php +++ b/src/lib/Core/Debug/Matcher/ObjectFunctionCallChainMatcher.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Matcher; +namespace Ibexa\Behat\Core\Debug\Matcher; use Psy\TabCompletion\Matcher\AbstractMatcher; use Psy\TabCompletion\Matcher\ObjectMethodsMatcher; @@ -117,3 +117,5 @@ protected function getObjectClass($tokenGroup): string return get_class($object); } } + +class_alias(ObjectFunctionCallChainMatcher::class, 'EzSystems\Behat\Core\Debug\Matcher\ObjectFunctionCallChainMatcher'); diff --git a/src/lib/Core/Debug/Matcher/ThisObjectMethodsMatcher.php b/src/lib/Core/Debug/Matcher/ThisObjectMethodsMatcher.php index 7a86ebee..5d59d77e 100644 --- a/src/lib/Core/Debug/Matcher/ThisObjectMethodsMatcher.php +++ b/src/lib/Core/Debug/Matcher/ThisObjectMethodsMatcher.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Matcher; +namespace Ibexa\Behat\Core\Debug\Matcher; use InvalidArgumentException; use Psy\TabCompletion\Matcher\AbstractMatcher; @@ -54,3 +54,5 @@ static function ($methodName) use ($input) { )); } } + +class_alias(ThisObjectMethodsMatcher::class, 'EzSystems\Behat\Core\Debug\Matcher\ThisObjectMethodsMatcher'); diff --git a/src/lib/Core/Debug/Shell/Shell.php b/src/lib/Core/Debug/Shell/Shell.php index 305f1edc..d0dd08f2 100644 --- a/src/lib/Core/Debug/Shell/Shell.php +++ b/src/lib/Core/Debug/Shell/Shell.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Debug\Shell; +namespace Ibexa\Behat\Core\Debug\Shell; use Exception; -use EzSystems\Behat\Core\Debug\Matcher\ObjectFunctionCallChainMatcher; -use EzSystems\Behat\Core\Debug\Matcher\ThisObjectMethodsMatcher; +use Ibexa\Behat\Core\Debug\Matcher\ObjectFunctionCallChainMatcher; +use Ibexa\Behat\Core\Debug\Matcher\ThisObjectMethodsMatcher; use Psy\Shell as BaseShell; use Psy\TabCompletion\Matcher\AbstractMatcher; use Psy\TabCompletion\Matcher\FunctionsMatcher; @@ -74,3 +74,5 @@ public function displayExceptionMessage(Exception $e) $this->writeMessage('The error message is: ' . $e->getMessage()); } } + +class_alias(Shell::class, 'EzSystems\Behat\Core\Debug\Shell\Shell'); diff --git a/src/lib/Core/Log/LogFileReader.php b/src/lib/Core/Log/LogFileReader.php index 7dcf01dc..42cb3222 100644 --- a/src/lib/Core/Log/LogFileReader.php +++ b/src/lib/Core/Log/LogFileReader.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Log; +namespace Ibexa\Behat\Core\Log; class LogFileReader { @@ -40,3 +40,5 @@ public function getLastLines($filePath, $numberOfLines): array return $logEntries; } } + +class_alias(LogFileReader::class, 'EzSystems\Behat\Core\Log\LogFileReader'); diff --git a/src/lib/Core/Log/TestLogProvider.php b/src/lib/Core/Log/TestLogProvider.php index 0798d8eb..3eeee1f6 100644 --- a/src/lib/Core/Log/TestLogProvider.php +++ b/src/lib/Core/Log/TestLogProvider.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Core\Log; +namespace Ibexa\Behat\Core\Log; use Behat\Mink\Driver\Selenium2Driver; use Behat\Mink\Session; @@ -108,3 +108,5 @@ private function cacheLogs(array $logs): void self::$LOGS = $logs; } } + +class_alias(TestLogProvider::class, 'EzSystems\Behat\Core\Log\TestLogProvider'); diff --git a/src/lib/Event/Events.php b/src/lib/Event/Events.php index ae07d88f..c8542941 100644 --- a/src/lib/Event/Events.php +++ b/src/lib/Event/Events.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Event; +namespace Ibexa\Behat\Event; class Events { @@ -30,3 +30,5 @@ class Events public const PUBLISH_LATER_TO_END = 'volume_testing.transition.publish_later_to_end'; } + +class_alias(Events::class, 'EzSystems\Behat\Event\Events'); diff --git a/src/lib/Event/InitialEvent.php b/src/lib/Event/InitialEvent.php index 5bcd0154..4abb6698 100644 --- a/src/lib/Event/InitialEvent.php +++ b/src/lib/Event/InitialEvent.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Event; +namespace Ibexa\Behat\Event; use Symfony\Contracts\EventDispatcher\Event; @@ -40,3 +40,5 @@ public function __construct(string $country, string $mainLanguage, array $editor $this->mainLanguage = $mainLanguage; } } + +class_alias(InitialEvent::class, 'EzSystems\Behat\Event\InitialEvent'); diff --git a/src/lib/Event/TransitionEvent.php b/src/lib/Event/TransitionEvent.php index 5c6e261c..4b11c831 100644 --- a/src/lib/Event/TransitionEvent.php +++ b/src/lib/Event/TransitionEvent.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Event; +namespace Ibexa\Behat\Event; use Symfony\Contracts\EventDispatcher\Event; @@ -42,3 +42,5 @@ public function __construct(array $editors, string $contentTypeIdentifier, strin $this->mainLanguage = $mainLanguage; } } + +class_alias(TransitionEvent::class, 'EzSystems\Behat\Event\TransitionEvent'); diff --git a/src/lib/QueryType/FoldersUnderMediaQueryType.php b/src/lib/QueryType/FoldersUnderMediaQueryType.php index 22c61908..f59f7c12 100644 --- a/src/lib/QueryType/FoldersUnderMediaQueryType.php +++ b/src/lib/QueryType/FoldersUnderMediaQueryType.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\QueryType; +namespace Ibexa\Behat\QueryType; use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; @@ -35,3 +35,5 @@ public static function getName() return 'Folders under media'; } } + +class_alias(FoldersUnderMediaQueryType::class, 'EzSystems\Behat\QueryType\FoldersUnderMediaQueryType'); diff --git a/src/lib/Subscriber/AbstractProcessStage.php b/src/lib/Subscriber/AbstractProcessStage.php index ef6a01ab..8f4adeae 100644 --- a/src/lib/Subscriber/AbstractProcessStage.php +++ b/src/lib/Subscriber/AbstractProcessStage.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Core\Repository\Values\User\User; @@ -117,3 +117,5 @@ public function execute(Event $event): void abstract protected function doExecute(TransitionEvent $event): void; } + +class_alias(AbstractProcessStage::class, 'EzSystems\Behat\Subscriber\AbstractProcessStage'); diff --git a/src/lib/Subscriber/CreateContentDraft.php b/src/lib/Subscriber/CreateContentDraft.php index f5237420..3ef2be8b 100644 --- a/src/lib/Subscriber/CreateContentDraft.php +++ b/src/lib/Subscriber/CreateContentDraft.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\API\Facade\ContentFacade; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\Facade\ContentFacade; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Workflow\Behat\Facade\WorkflowFacade; @@ -66,3 +66,5 @@ public function doExecute(TransitionEvent $event): void $this->workflowFacade->transition($event->content, $transitionName, $this->randomDataGenerator->getRandomTextLine()); } } + +class_alias(CreateContentDraft::class, 'EzSystems\Behat\Subscriber\CreateContentDraft'); diff --git a/src/lib/Subscriber/EditContent.php b/src/lib/Subscriber/EditContent.php index aa4f069e..0bf5b28a 100644 --- a/src/lib/Subscriber/EditContent.php +++ b/src/lib/Subscriber/EditContent.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\ContentDataProvider; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\ContentDataProvider; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; @@ -76,3 +76,5 @@ protected function doExecute(TransitionEvent $event): void $this->workflowFacade->transition($event->content, $transitionName, $this->randomDataGenerator->getRandomTextLine()); } } + +class_alias(EditContent::class, 'EzSystems\Behat\Subscriber\EditContent'); diff --git a/src/lib/Subscriber/InitialStage.php b/src/lib/Subscriber/InitialStage.php index 163b53d7..e7c0c613 100644 --- a/src/lib/Subscriber/InitialStage.php +++ b/src/lib/Subscriber/InitialStage.php @@ -6,13 +6,13 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\API\Facade\SearchFacade; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\InitialEvent; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\API\Facade\SearchFacade; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\InitialEvent; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Psr\Log\LoggerInterface; @@ -86,3 +86,5 @@ protected function doExecute(TransitionEvent $event): void { } } + +class_alias(InitialStage::class, 'EzSystems\Behat\Subscriber\InitialStage'); diff --git a/src/lib/Subscriber/PublishDraft.php b/src/lib/Subscriber/PublishDraft.php index f9693b9a..395cc52b 100644 --- a/src/lib/Subscriber/PublishDraft.php +++ b/src/lib/Subscriber/PublishDraft.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; @@ -64,3 +64,5 @@ protected function doExecute(TransitionEvent $event): void $event->content = $this->contentService->publishVersion($event->content->versionInfo); } } + +class_alias(PublishDraft::class, 'EzSystems\Behat\Subscriber\PublishDraft'); diff --git a/src/lib/Subscriber/PublishInTheFuture.php b/src/lib/Subscriber/PublishInTheFuture.php index e4ddbdf7..7a454c80 100644 --- a/src/lib/Subscriber/PublishInTheFuture.php +++ b/src/lib/Subscriber/PublishInTheFuture.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Scheduler\Repository\DateBasedPublishServiceInterface; @@ -63,3 +63,5 @@ public static function getSubscribedEvents() ]; } } + +class_alias(PublishInTheFuture::class, 'EzSystems\Behat\Subscriber\PublishInTheFuture'); diff --git a/src/lib/Subscriber/Review.php b/src/lib/Subscriber/Review.php index 618e8382..30066b16 100644 --- a/src/lib/Subscriber/Review.php +++ b/src/lib/Subscriber/Review.php @@ -6,12 +6,12 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Subscriber; +namespace Ibexa\Behat\Subscriber; -use EzSystems\Behat\API\ContentData\ContentDataProvider; -use EzSystems\Behat\API\ContentData\RandomDataGenerator; -use EzSystems\Behat\Event\Events; -use EzSystems\Behat\Event\TransitionEvent; +use Ibexa\Behat\API\ContentData\ContentDataProvider; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; +use Ibexa\Behat\Event\Events; +use Ibexa\Behat\Event\TransitionEvent; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; @@ -77,3 +77,5 @@ protected function doExecute(TransitionEvent $event): void $this->workflowFacade->transition($event->content, $transitionName, $this->randomDataGenerator->getRandomTextLine()); } } + +class_alias(Review::class, 'EzSystems\Behat\Subscriber\Review'); diff --git a/tests/Browser/Element/BaseTestCase.php b/tests/lib/Browser/Element/BaseTestCase.php similarity index 95% rename from tests/Browser/Element/BaseTestCase.php rename to tests/lib/Browser/Element/BaseTestCase.php index 5703ab82..28e7cc3c 100644 --- a/tests/Browser/Element/BaseTestCase.php +++ b/tests/lib/Browser/Element/BaseTestCase.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element; +namespace Ibexa\Tests\Behat\Browser\Element; use Behat\Mink\Element\NodeElement; use Ibexa\Behat\Browser\Element\ElementCollection; @@ -73,3 +73,5 @@ public function createCollection(LocatorInterface $locator, ...$elementTexts): E return new ElementCollection($locator, $elements); } } + +class_alias(BaseTestCase::class, 'EzSystems\Behat\Test\Browser\Element\BaseTestCase'); diff --git a/tests/Browser/Element/Condition/ElementExistsConditionTest.php b/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php similarity index 86% rename from tests/Browser/Element/Condition/ElementExistsConditionTest.php rename to tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php index 5bd21ff7..5f61e2d1 100644 --- a/tests/Browser/Element/Condition/ElementExistsConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Condition; +namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; use PHPUnit\Framework\Assert; @@ -43,3 +43,5 @@ public function testElementDoesNotExist(): void ); } } + +class_alias(ElementExistsConditionTest::class, 'EzSystems\Behat\Test\Browser\Element\Condition\ElementExistsConditionTest'); diff --git a/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php b/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php similarity index 87% rename from tests/Browser/Element/Condition/ElementNotExistsConditionTest.php rename to tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php index 633192e0..b26ba0fe 100644 --- a/tests/Browser/Element/Condition/ElementNotExistsConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Condition; +namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; use PHPUnit\Framework\Assert; @@ -47,3 +47,5 @@ public function testElementExist(): void ); } } + +class_alias(ElementNotExistsConditionTest::class, 'EzSystems\Behat\Test\Browser\Element\Condition\ElementNotExistsConditionTest'); diff --git a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php similarity index 92% rename from tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php rename to tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php index 0311307b..0bcb144e 100644 --- a/tests/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Condition; +namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementTransitionHasEndedCondition; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -76,3 +76,5 @@ private function createChildElement(bool $hasStartedTransition, bool $hasEndedTr return $childElement; } } + +class_alias(ElementTransitionHasEndedConditionTest::class, 'EzSystems\Behat\Test\Browser\Element\Condition\ElementTransitionHasEndedConditionTest'); diff --git a/tests/Browser/Element/Condition/ElementsCountConditionTest.php b/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php similarity index 87% rename from tests/Browser/Element/Condition/ElementsCountConditionTest.php rename to tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php index 948b6413..b897b3f5 100644 --- a/tests/Browser/Element/Condition/ElementsCountConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Condition; +namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementsCountCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; use PHPUnit\Framework\Assert; @@ -45,3 +45,5 @@ public function testExpectedCountNotPresent(): void ); } } + +class_alias(ElementsCountConditionTest::class, 'EzSystems\Behat\Test\Browser\Element\Condition\ElementsCountConditionTest'); diff --git a/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php b/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php similarity index 86% rename from tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php rename to tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php index 360d5233..4dd7d341 100644 --- a/tests/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Condition; +namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementsCountGreaterThanCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; use PHPUnit\Framework\Assert; @@ -45,3 +45,5 @@ public function testExpectedCountNotPresent(): void ); } } + +class_alias(ElementsCountGreaterThanConditionTest::class, 'EzSystems\Behat\Test\Browser\Element\Condition\ElementsCountGreaterThanConditionTest'); diff --git a/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php b/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php similarity index 92% rename from tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php rename to tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php index f491086f..1904af39 100644 --- a/tests/Browser/Element/Criterion/ChildElementTextCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Criterion; +namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ChildElementTextCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -68,3 +68,5 @@ public function testGetErrorMessageWhenOtherElementFound(): void ); } } + +class_alias(ChildElementTextCriterionTest::class, 'EzSystems\Behat\Test\Browser\Element\Criterion\ChildElementTextCriterionTest'); diff --git a/tests/Browser/Element/Criterion/ElementAttributeCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php similarity index 91% rename from tests/Browser/Element/Criterion/ElementAttributeCriterionTest.php rename to tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php index 9f2df0ca..05dd6d39 100644 --- a/tests/Browser/Element/Criterion/ElementAttributeCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Criterion; +namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementAttributeCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -65,3 +65,5 @@ private function createElementWithAttribute($attribute, $value): ElementInterfac return $element; } } + +class_alias(ElementAttributeCriterionTest::class, 'EzSystems\Behat\Test\Browser\Element\Criterion\ElementAttributeCriterionTest'); diff --git a/tests/Browser/Element/Criterion/ElementTextCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php similarity index 88% rename from tests/Browser/Element/Criterion/ElementTextCriterionTest.php rename to tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php index 78f02915..07f25165 100644 --- a/tests/Browser/Element/Criterion/ElementTextCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Criterion; +namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -56,3 +56,5 @@ public function testGetErrorMessageWhenCollectionIsEmpty(): void ); } } + +class_alias(ElementTextCriterionTest::class, 'EzSystems\Behat\Test\Browser\Element\Criterion\ElementTextCriterionTest'); diff --git a/tests/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php similarity index 88% rename from tests/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php rename to tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php index c995dd72..40f7e0d6 100644 --- a/tests/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Criterion; +namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextFragmentCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -57,3 +57,5 @@ public function testGetErrorMessageWhenNoElementFound(): void ); } } + +class_alias(ElementTextFragmentCriterionTest::class, 'EzSystems\Behat\Test\Browser\Element\Criterion\ElementTextFragmentCriterionTest'); diff --git a/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php b/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php similarity index 88% rename from tests/Browser/Element/Criterion/LogicalOrCriterionTest.php rename to tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php index d7a1a0bf..d96eaaea 100644 --- a/tests/Browser/Element/Criterion/LogicalOrCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Criterion; +namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion; use Ibexa\Behat\Browser\Element\Criterion\LogicalOrCriterion; use Ibexa\Behat\Browser\Locator\CSSLocator; @@ -47,3 +47,5 @@ public function testNoMatchWhenNoCriterionMatches(): void ); } } + +class_alias(LogicalOrCriterionTest::class, 'EzSystems\Behat\Test\Browser\Element\Criterion\LogicalOrCriterionTest'); diff --git a/tests/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php b/tests/lib/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php similarity index 77% rename from tests/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php rename to tests/lib/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php index b652ef7b..4dae0711 100644 --- a/tests/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php +++ b/tests/lib/Browser/Element/Debug/Assert/Interactive/CollectionAssertTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Debug\Assert\Interactive; +namespace Ibexa\Tests\Behat\Browser\Element\Debug\Assert\Interactive; use Ibexa\Behat\Browser\Assert\CollectionAssertInterface; use Ibexa\Behat\Browser\Assert\Debug\Interactive\CollectionAssert; @@ -22,3 +22,5 @@ public function testShouldBeInitializable(): void Assert::assertInstanceOf(CollectionAssert::class, $collectionAssert); } } + +class_alias(CollectionAssertTest::class, 'EzSystems\Behat\Test\Browser\Element\Debug\Assert\Interactive\CollectionAssertTest'); diff --git a/tests/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php b/tests/lib/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php similarity index 77% rename from tests/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php rename to tests/lib/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php index 8f6f7af8..32f7c81f 100644 --- a/tests/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php +++ b/tests/lib/Browser/Element/Debug/Assert/Interactive/ElementAssertTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Debug\Assert\Interactive; +namespace Ibexa\Tests\Behat\Browser\Element\Debug\Assert\Interactive; use Ibexa\Behat\Browser\Assert\Debug\Interactive\ElementAssert; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; @@ -22,3 +22,5 @@ public function testShouldBeInitializable(): void Assert::assertInstanceOf(ElementAssert::class, $collectionAssert); } } + +class_alias(ElementAssertTest::class, 'EzSystems\Behat\Test\Browser\Element\Debug\Assert\Interactive\ElementAssertTest'); diff --git a/tests/Browser/Element/Debug/HighlightingElementTest.php b/tests/lib/Browser/Element/Debug/HighlightingElementTest.php similarity index 80% rename from tests/Browser/Element/Debug/HighlightingElementTest.php rename to tests/lib/Browser/Element/Debug/HighlightingElementTest.php index 972ebb7a..95e52fca 100644 --- a/tests/Browser/Element/Debug/HighlightingElementTest.php +++ b/tests/lib/Browser/Element/Debug/HighlightingElementTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Debug; +namespace Ibexa\Tests\Behat\Browser\Element\Debug; use Behat\Mink\Session; use Ibexa\Behat\Browser\Element\Debug\Highlighting\Element; @@ -23,3 +23,5 @@ public function testShouldBeInitializable(): void Assert::assertInstanceOf(Element::class, $element); } } + +class_alias(HighlightingElementTest::class, 'EzSystems\Behat\Test\Browser\Element\Debug\HighlightingElementTest'); diff --git a/tests/Browser/Element/Debug/InteractiveElementTest.php b/tests/lib/Browser/Element/Debug/InteractiveElementTest.php similarity index 79% rename from tests/Browser/Element/Debug/InteractiveElementTest.php rename to tests/lib/Browser/Element/Debug/InteractiveElementTest.php index a86bdd4b..82419be5 100644 --- a/tests/Browser/Element/Debug/InteractiveElementTest.php +++ b/tests/lib/Browser/Element/Debug/InteractiveElementTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Debug; +namespace Ibexa\Tests\Behat\Browser\Element\Debug; use Ibexa\Behat\Browser\Element\Debug\Interactive\Element; use Ibexa\Behat\Browser\Element\ElementInterface; @@ -22,3 +22,5 @@ public function testShouldBeInitializable(): void Assert::assertInstanceOf(Element::class, $element); } } + +class_alias(InteractiveElementTest::class, 'EzSystems\Behat\Test\Browser\Element\Debug\InteractiveElementTest'); diff --git a/tests/Browser/Element/ElementCollectionTest.php b/tests/lib/Browser/Element/ElementCollectionTest.php similarity index 97% rename from tests/Browser/Element/ElementCollectionTest.php rename to tests/lib/Browser/Element/ElementCollectionTest.php index ee163966..eff882a8 100644 --- a/tests/Browser/Element/ElementCollectionTest.php +++ b/tests/lib/Browser/Element/ElementCollectionTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element; +namespace Ibexa\Tests\Behat\Browser\Element; use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion; use Ibexa\Behat\Browser\Element\ElementCollection; @@ -205,3 +205,5 @@ public function testGet(): void ); } } + +class_alias(ElementCollectionTest::class, 'EzSystems\Behat\Test\Browser\Element\ElementCollectionTest'); diff --git a/tests/Browser/Element/ElementTest.php b/tests/lib/Browser/Element/ElementTest.php similarity index 98% rename from tests/Browser/Element/ElementTest.php rename to tests/lib/Browser/Element/ElementTest.php index 4386707f..36744f8e 100644 --- a/tests/Browser/Element/ElementTest.php +++ b/tests/lib/Browser/Element/ElementTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element; +namespace Ibexa\Tests\Behat\Browser\Element; use Behat\Mink\Element\NodeElement; use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition; @@ -183,3 +183,5 @@ private function createElementWithMinkElement(NodeELement $nodeElement) return new Element(new ElementFactory(), $this->irrelevantLocator, $nodeElement); } } + +class_alias(ElementTest::class, 'EzSystems\Behat\Test\Browser\Element\ElementTest'); diff --git a/tests/Browser/Element/Mapper/TextMapperTestCase.php b/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php similarity index 77% rename from tests/Browser/Element/Mapper/TextMapperTestCase.php rename to tests/lib/Browser/Element/Mapper/TextMapperTestCase.php index 1b371be6..c613a9c3 100644 --- a/tests/Browser/Element/Mapper/TextMapperTestCase.php +++ b/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Element\Mapper; +namespace Ibexa\Tests\Behat\Browser\Element\Mapper; -use EzSystems\Behat\Test\Browser\Element\BaseTestCase; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper; use PHPUnit\Framework\Assert; @@ -29,3 +29,5 @@ public function testMapsSingleElement(): void Assert::assertEquals('Element1', $this->mapper->map($element)); } } + +class_alias(TextMapperTestCase::class, 'EzSystems\Behat\Test\Browser\Element\Mapper\TextMapperTestCase'); diff --git a/tests/Browser/Filter/BrowserLogFilterTest.php b/tests/lib/Browser/Filter/BrowserLogFilterTest.php similarity index 93% rename from tests/Browser/Filter/BrowserLogFilterTest.php rename to tests/lib/Browser/Filter/BrowserLogFilterTest.php index dbdd57dd..6eb01479 100644 --- a/tests/Browser/Filter/BrowserLogFilterTest.php +++ b/tests/lib/Browser/Filter/BrowserLogFilterTest.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Browser\Filter; +namespace Ibexa\Tests\Behat\Browser\Filter; use Ibexa\Behat\Browser\Filter\BrowserLogFilter; use PHPUnit\Framework\Assert; @@ -38,3 +38,5 @@ public function testFiltersOutExcludedPatterns() Assert::assertEquals(['Real JS Error', 'Another real JS error'], $actualResult); } } + +class_alias(BrowserLogFilterTest::class, 'EzSystems\Behat\Test\Browser\Filter\BrowserLogFilterTest'); diff --git a/tests/Core/Behat/ArgumentParserTest.php b/tests/lib/Core/Behat/ArgumentParserTest.php similarity index 88% rename from tests/Core/Behat/ArgumentParserTest.php rename to tests/lib/Core/Behat/ArgumentParserTest.php index 4fe7da8b..9cff2346 100644 --- a/tests/Core/Behat/ArgumentParserTest.php +++ b/tests/lib/Core/Behat/ArgumentParserTest.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Core\Behat; +namespace Ibexa\Tests\Behat\Core\Behat; -use EzSystems\Behat\API\Facade\RoleFacade; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\API\Facade\RoleFacade; +use Ibexa\Behat\Core\Behat\ArgumentParser; use Ibexa\Behat\Browser\Environment\ParameterProvider; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; @@ -56,3 +56,5 @@ public function provideUrlData() ]; } } + +class_alias(ArgumentParserTest::class, 'EzSystems\Behat\Test\Core\Behat\ArgumentParserTest'); diff --git a/tests/Core/Behat/ExtendedTableNodeTest.php b/tests/lib/Core/Behat/ExtendedTableNodeTest.php similarity index 94% rename from tests/Core/Behat/ExtendedTableNodeTest.php rename to tests/lib/Core/Behat/ExtendedTableNodeTest.php index c602a52e..58b66c24 100644 --- a/tests/Core/Behat/ExtendedTableNodeTest.php +++ b/tests/lib/Core/Behat/ExtendedTableNodeTest.php @@ -6,10 +6,10 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Core\Behat; +namespace Ibexa\Tests\Behat\Core\Behat; use Behat\Gherkin\Node\TableNode; -use EzSystems\Behat\Core\Behat\TableNodeExtension; +use Ibexa\Behat\Core\Behat\TableNodeExtension; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; @@ -87,3 +87,5 @@ public function testCanRemoveColumn() ['Value21', 'Value23'], ], $afterTable->getTable()); } } + +class_alias(ExtendedTableNodeTest::class, 'EzSystems\Behat\Test\Core\Behat\ExtendedTableNodeTest'); diff --git a/tests/Core/Configuration/ConfigurationEditorTest.php b/tests/lib/Core/Configuration/ConfigurationEditorTest.php similarity index 97% rename from tests/Core/Configuration/ConfigurationEditorTest.php rename to tests/lib/Core/Configuration/ConfigurationEditorTest.php index 15169646..f81bf243 100644 --- a/tests/Core/Configuration/ConfigurationEditorTest.php +++ b/tests/lib/Core/Configuration/ConfigurationEditorTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Core\Configuration; +namespace Ibexa\Tests\Behat\Core\Configuration; -use EzSystems\Behat\Core\Configuration\ConfigurationEditor; +use Ibexa\Behat\Core\Configuration\ConfigurationEditor; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; @@ -284,3 +284,5 @@ public function testGetMultipleValues() Assert::assertEquals(['initialValue1', 'initialValue2'], $value); } } + +class_alias(ConfigurationEditorTest::class, 'EzSystems\Behat\Test\Core\Configuration\ConfigurationEditorTest'); diff --git a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php b/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php similarity index 88% rename from tests/Core/Configuration/LocationAwareConfigurationEditorTest.php rename to tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php index 06c341ea..8be96832 100644 --- a/tests/Core/Configuration/LocationAwareConfigurationEditorTest.php +++ b/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php @@ -6,11 +6,11 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Core\Configuration; +namespace Ibexa\Tests\Behat\Core\Configuration; -use EzSystems\Behat\API\Facade\ContentFacade; -use EzSystems\Behat\Core\Configuration\ConfigurationEditor; -use EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor; +use Ibexa\Behat\API\Facade\ContentFacade; +use Ibexa\Behat\Core\Configuration\ConfigurationEditor; +use Ibexa\Behat\Core\Configuration\LocationAwareConfigurationEditor; use Ibexa\Core\Repository\Values\Content\Location; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; @@ -89,3 +89,5 @@ public function testReplacesValueWhenAppendIsUsed() Assert::assertEquals(['testKey' => [2, 5]], $config); } } + +class_alias(LocationAwareConfigurationEditorTest::class, 'EzSystems\Behat\Test\Core\Configuration\LocationAwareConfigurationEditorTest'); diff --git a/tests/Core/Log/LogFileReaderTest.php b/tests/lib/Core/Log/LogFileReaderTest.php similarity index 91% rename from tests/Core/Log/LogFileReaderTest.php rename to tests/lib/Core/Log/LogFileReaderTest.php index 09acff98..6797a034 100644 --- a/tests/Core/Log/LogFileReaderTest.php +++ b/tests/lib/Core/Log/LogFileReaderTest.php @@ -6,9 +6,9 @@ */ declare(strict_types=1); -namespace EzSystems\Behat\Test\Core\Log; +namespace Ibexa\Tests\Behat\Core\Log; -use EzSystems\Behat\Core\Log\LogFileReader; +use Ibexa\Behat\Core\Log\LogFileReader; use org\bovigo\vfs\vfsStream; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; @@ -79,3 +79,5 @@ public function testReturnsCorrectArrayWhenThereIsMoreLogsThanLimit() Assert::assertEquals([2, 3, 4, 5, 6], $logEntries); } } + +class_alias(LogFileReaderTest::class, 'EzSystems\Behat\Test\Core\Log\LogFileReaderTest'); From 39baee6bb3fa18e3af94661c548d21dedbcaf03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 15 Feb 2022 19:48:46 +0100 Subject: [PATCH 31/85] Generate:bundle-resources --- src/bundle/Resources/config/services.yaml | 40 +++++------ .../Resources/config/services/contexts.yaml | 42 ++++++------ .../config/services/controllers.yaml | 6 +- .../services/fieldtype_data_providers.yaml | 66 +++++++++---------- .../config/services/limitation_parsers.yaml | 42 ++++++------ .../Resources/config/services/stages.yaml | 12 ++-- src/bundle/Resources/config/services_dxp.yaml | 4 +- 7 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml index 1bd96f49..ae766429 100644 --- a/src/bundle/Resources/config/services.yaml +++ b/src/bundle/Resources/config/services.yaml @@ -12,50 +12,50 @@ services: autoconfigure: true public: false - EzSystems\Behat\API\ContentData\ContentDataProvider: + Ibexa\Behat\API\ContentData\ContentDataProvider: arguments: - '@ibexa.api.service.content_type' - '@ibexa.api.service.content' - EzSystems\Behat\API\ContentData\RandomDataGenerator: ~ + Ibexa\Behat\API\ContentData\RandomDataGenerator: ~ - EzSystems\Behat\API\Facade\ContentFacade: + Ibexa\Behat\API\Facade\ContentFacade: public: true - EzSystems\Behat\API\Facade\SearchFacade: + Ibexa\Behat\API\Facade\SearchFacade: arguments: - '@Ibexa\Contracts\Core\Repository\URLAliasService' - '@Ibexa\Contracts\Core\Repository\LocationService' - '@ibexa.api.service.search' - EzSystems\Behat\API\Facade\ContentTypeFacade: + Ibexa\Behat\API\Facade\ContentTypeFacade: public: true arguments: - '@ibexa.api.service.content_type' - '@ibexa.cache_pool' - EzSystems\Behat\API\Facade\RoleFacade: + Ibexa\Behat\API\Facade\RoleFacade: public: true - EzSystems\Behat\API\Facade\UserFacade: + Ibexa\Behat\API\Facade\UserFacade: public: true - EzSystems\Behat\API\Facade\LanguageFacade: + Ibexa\Behat\API\Facade\LanguageFacade: public: true - EzSystems\Behat\API\Facade\TrashFacade: + Ibexa\Behat\API\Facade\TrashFacade: public: true Ibexa\Behat\Browser\Environment\ParameterProvider: ~ Ibexa\Behat\Browser\Environment\ParameterProviderInterface: '@Ibexa\Behat\Browser\Environment\ParameterProvider' - EzSystems\Behat\Core\Behat\ArgumentParser: + Ibexa\Behat\Core\Behat\ArgumentParser: public: true arguments: - - '@EzSystems\Behat\API\Facade\RoleFacade' + - '@Ibexa\Behat\API\Facade\RoleFacade' - EzSystems\BehatBundle\Command\CreateLanguageCommand: + Ibexa\Bundle\Behat\Command\CreateLanguageCommand: arguments: $languageService: '@ibexa.api.service.language' $userService: '@ibexa.api.service.user' @@ -63,31 +63,31 @@ services: tags: - { name: console.command } - EzSystems\BehatBundle\Command\GetPullRequestDataCommand: + Ibexa\Bundle\Behat\Command\GetPullRequestDataCommand: tags: - { name: console.command } - EzSystems\BehatBundle\Templating\Twig\PHPTypeExtension: + Ibexa\Bundle\Behat\Templating\Twig\PHPTypeExtension: tags: - { name: twig.extension } - EzSystems\BehatBundle\Command\TestSiteaccessCommand: + Ibexa\Bundle\Behat\Command\TestSiteaccessCommand: arguments: $siteaccess: '@Ibexa\Core\MVC\Symfony\SiteAccess' tags: - { name: console.command } - EzSystems\Behat\QueryType\FoldersUnderMediaQueryType: ~ + Ibexa\Behat\QueryType\FoldersUnderMediaQueryType: ~ - EzSystems\Behat\Core\Configuration\ConfigurationEditor: ~ + Ibexa\Behat\Core\Configuration\ConfigurationEditor: ~ - EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor: - decorates: EzSystems\Behat\Core\Configuration\ConfigurationEditor + Ibexa\Behat\Core\Configuration\LocationAwareConfigurationEditor: + decorates: Ibexa\Behat\Core\Configuration\ConfigurationEditor Ibexa\Behat\Browser\Routing\Router: arguments: $router: '@Ibexa\Core\MVC\Symfony\SiteAccess\Router' - EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface: '@EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor' + Ibexa\Behat\Core\Configuration\ConfigurationEditorInterface: '@Ibexa\Behat\Core\Configuration\LocationAwareConfigurationEditor' Ibexa\Behat\Browser\FileUpload\FileUploadHelper: ~ diff --git a/src/bundle/Resources/config/services/contexts.yaml b/src/bundle/Resources/config/services/contexts.yaml index 8703a246..64d4b8a0 100644 --- a/src/bundle/Resources/config/services/contexts.yaml +++ b/src/bundle/Resources/config/services/contexts.yaml @@ -4,57 +4,57 @@ services: autoconfigure: true public: false - EzSystems\Behat\API\Context\ContentContext: + Ibexa\Behat\API\Context\ContentContext: public: true arguments: - $contentFacade: '@EzSystems\Behat\API\Facade\ContentFacade' - $argumentParser: '@EzSystems\Behat\Core\Behat\ArgumentParser' + $contentFacade: '@Ibexa\Behat\API\Facade\ContentFacade' + $argumentParser: '@Ibexa\Behat\Core\Behat\ArgumentParser' - EzSystems\Behat\API\Context\TrashContext: + Ibexa\Behat\API\Context\TrashContext: public: true arguments: - $trashFacade: '@EzSystems\Behat\API\Facade\TrashFacade' - $argumentParser: '@EzSystems\Behat\Core\Behat\ArgumentParser' + $trashFacade: '@Ibexa\Behat\API\Facade\TrashFacade' + $argumentParser: '@Ibexa\Behat\Core\Behat\ArgumentParser' - EzSystems\Behat\API\Context\ContentTypeContext: + Ibexa\Behat\API\Context\ContentTypeContext: public: true arguments: - $contentTypeFacade: '@EzSystems\Behat\API\Facade\ContentTypeFacade' + $contentTypeFacade: '@Ibexa\Behat\API\Facade\ContentTypeFacade' - EzSystems\Behat\API\Context\LanguageContext: + Ibexa\Behat\API\Context\LanguageContext: public: true arguments: - $languageFacade: '@EzSystems\Behat\API\Facade\LanguageFacade' + $languageFacade: '@Ibexa\Behat\API\Facade\LanguageFacade' - EzSystems\Behat\API\Context\ObjectStateContext: + Ibexa\Behat\API\Context\ObjectStateContext: public: true arguments: $objectStateService: '@ibexa.api.service.object_state' - EzSystems\Behat\API\Context\RoleContext: + Ibexa\Behat\API\Context\RoleContext: public: true arguments: - $roleFacade: '@EzSystems\Behat\API\Facade\RoleFacade' - $argumentParser: '@EzSystems\Behat\Core\Behat\ArgumentParser' + $roleFacade: '@Ibexa\Behat\API\Facade\RoleFacade' + $argumentParser: '@Ibexa\Behat\Core\Behat\ArgumentParser' - EzSystems\Behat\API\Context\TestContext: + Ibexa\Behat\API\Context\TestContext: public: true arguments: $userService: '@ibexa.api.service.user' $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver' - EzSystems\Behat\API\Context\UserContext: + Ibexa\Behat\API\Context\UserContext: public: true arguments: - $userFacade: '@EzSystems\Behat\API\Facade\UserFacade' - $argumentParser: '@EzSystems\Behat\Core\Behat\ArgumentParser' + $userFacade: '@Ibexa\Behat\API\Facade\UserFacade' + $argumentParser: '@Ibexa\Behat\Core\Behat\ArgumentParser' - EzSystems\Behat\Core\Context\ConfigurationContext: + Ibexa\Behat\Core\Context\ConfigurationContext: public: true arguments: $projectDir: '%kernel.project_dir%' - EzSystems\Behat\Core\Context\FileContext: + Ibexa\Behat\Core\Context\FileContext: public: true arguments: $projectDirectory: '%kernel.project_dir%' @@ -67,7 +67,7 @@ services: $logger: '@logger' $logDir: '%kernel.logs_dir%' - EzSystems\Behat\Core\Context\TimeContext: ~ + Ibexa\Behat\Core\Context\TimeContext: ~ Ibexa\Behat\Browser\Context\ContentPreviewContext: ~ diff --git a/src/bundle/Resources/config/services/controllers.yaml b/src/bundle/Resources/config/services/controllers.yaml index fa6fdace..7fe71f61 100644 --- a/src/bundle/Resources/config/services/controllers.yaml +++ b/src/bundle/Resources/config/services/controllers.yaml @@ -4,14 +4,14 @@ services: autoconfigure: true public: false - EzSystems\BehatBundle\Controller\ExceptionController: + Ibexa\Bundle\Behat\Controller\ExceptionController: public: true ezbehatbundle.controller.exception: - class: EzSystems\BehatBundle\Controller\ExceptionController + class: Ibexa\Bundle\Behat\Controller\ExceptionController public: true - EzSystems\BehatBundle\Controller\RenderController: ~ + Ibexa\Bundle\Behat\Controller\RenderController: ~ Ibexa\Bundle\Behat\Controller\UnauthenticatedRedirectController: tags: [ 'controller.service_arguments' ] diff --git a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml index 6169ce66..73ee706f 100644 --- a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml +++ b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml @@ -5,82 +5,82 @@ services: public: false _instanceof: - EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface: + Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface: tags: ['ezplatform.behat.fieldtype_data_provider'] - EzSystems\Behat\API\ContentData\FieldTypeData\RandomDataGenerator: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\RandomDataGenerator: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\ObjectRelationDataProvider: arguments: - - '@EzSystems\Behat\API\Facade\SearchFacade' + - '@Ibexa\Behat\API\Facade\SearchFacade' - '@ibexa.api.service.content' - EzSystems\Behat\API\ContentData\FieldTypeData\ObjectRelationListDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\ObjectRelationListDataProvider: arguments: - - '@EzSystems\Behat\API\Facade\SearchFacade' + - '@Ibexa\Behat\API\Facade\SearchFacade' - '@ibexa.api.service.content' - EzSystems\Behat\API\ContentData\FieldTypeData\AuthorDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\AuthorDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\BinaryFileDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\BinaryFileDataProvider: arguments: $projectDir: '%kernel.project_dir%' - EzSystems\Behat\API\ContentData\FieldTypeData\BooleanDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\BooleanDataProvider: arguments: - - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' + - '@Ibexa\Behat\API\ContentData\RandomDataGenerator' - '@Ibexa\Contracts\Core\Repository\ContentTypeService' - EzSystems\Behat\API\ContentData\FieldTypeData\CountryDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\CountryDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\DateDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\DateDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\DateTimeDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\DateTimeDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\EmailDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\EmailDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\FloatDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\FloatDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\ISBNDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\ISBNDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\MatrixDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\MatrixDataProvider: arguments: - - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' + - '@Ibexa\Behat\API\ContentData\RandomDataGenerator' - '@Ibexa\Contracts\Core\Repository\ContentTypeService' - EzSystems\Behat\API\ContentData\FieldTypeData\SelectionDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\SelectionDataProvider: arguments: - '@Ibexa\Contracts\Core\Repository\ContentTypeService' - EzSystems\Behat\API\ContentData\FieldTypeData\ImageAssetDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\ImageAssetDataProvider: arguments: - - '@EzSystems\Behat\API\ContentData\RandomDataGenerator' + - '@Ibexa\Behat\API\ContentData\RandomDataGenerator' - '@Ibexa\Core\FieldType\ImageAsset\AssetMapper' - - '@EzSystems\Behat\API\ContentData\FieldTypeData\ImageDataProvider' - - '@EzSystems\Behat\Core\Behat\ArgumentParser' + - '@Ibexa\Behat\API\ContentData\FieldTypeData\ImageDataProvider' + - '@Ibexa\Behat\Core\Behat\ArgumentParser' - '@Ibexa\Contracts\Core\Repository\LocationService' - '@Ibexa\Contracts\Core\Repository\URLAliasService' - EzSystems\Behat\API\ContentData\FieldTypeData\ImageDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\ImageDataProvider: arguments: $projectDir: '%kernel.project_dir%' - EzSystems\Behat\API\ContentData\FieldTypeData\IntegerDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\IntegerDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\MapDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\MapDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\MediaDataProvider: + Ibexa\Behat\API\ContentData\FieldTypeData\MediaDataProvider: arguments: $projectDir: '%kernel.project_dir%' - EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\PasswordProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\RichTextDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\RichTextDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\TextLineDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\TextLineDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\TextBlockDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\TextBlockDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\TimeDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\TimeDataProvider: ~ - EzSystems\Behat\API\ContentData\FieldTypeData\URLDataProvider: ~ + Ibexa\Behat\API\ContentData\FieldTypeData\URLDataProvider: ~ diff --git a/src/bundle/Resources/config/services/limitation_parsers.yaml b/src/bundle/Resources/config/services/limitation_parsers.yaml index 9d7d4c93..004efaf2 100644 --- a/src/bundle/Resources/config/services/limitation_parsers.yaml +++ b/src/bundle/Resources/config/services/limitation_parsers.yaml @@ -5,55 +5,55 @@ services: public: false _instanceof: - EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface: + Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface: tags: ['ezplatform.behat.limitation_parser'] - EzSystems\Behat\API\Context\LimitationParser\ContentTypeLimitationParser: + Ibexa\Behat\API\Context\LimitationParser\ContentTypeLimitationParser: arguments: - '@ibexa.api.service.content_type' - EzSystems\Behat\API\Context\LimitationParser\FieldGroupLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\FieldGroupLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\LocationLimitationParser: + Ibexa\Behat\API\Context\LimitationParser\LocationLimitationParser: arguments: - '@ibexa.api.service.url_alias' - '@ibexa.api.service.location' - - '@EzSystems\Behat\Core\Behat\ArgumentParser' + - '@Ibexa\Behat\Core\Behat\ArgumentParser' - EzSystems\Behat\API\Context\LimitationParser\NewSectionLimitationParser: + Ibexa\Behat\API\Context\LimitationParser\NewSectionLimitationParser: arguments: - '@ibexa.api.service.section' - EzSystems\Behat\API\Context\LimitationParser\NewStateLimitationParser: + Ibexa\Behat\API\Context\LimitationParser\NewStateLimitationParser: arguments: - '@ibexa.api.service.object_state' - EzSystems\Behat\API\Context\LimitationParser\ObjectStateLimitationParser: + Ibexa\Behat\API\Context\LimitationParser\ObjectStateLimitationParser: arguments: - '@ibexa.api.service.object_state' - EzSystems\Behat\API\Context\LimitationParser\LanguageLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\LanguageLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector: ~ + Ibexa\Behat\API\Context\LimitationParser\LimitationParsersCollector: ~ - EzSystems\Behat\API\Context\LimitationParser\OwnerLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\OwnerLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\ParentContentTypeLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\ParentContentTypeLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\ParentDepthLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\ParentDepthLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\ParentOwnerLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\ParentOwnerLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\ParentUserGroupLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\ParentUserGroupLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\SectionLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\SectionLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\SiteaccessLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\SiteaccessLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\SubtreeLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\SubtreeLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\UserGroupLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\UserGroupLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\WorkflowStageLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\WorkflowStageLimitationParser: ~ - EzSystems\Behat\API\Context\LimitationParser\WorkflowTransitionLimitationParser: ~ + Ibexa\Behat\API\Context\LimitationParser\WorkflowTransitionLimitationParser: ~ diff --git a/src/bundle/Resources/config/services/stages.yaml b/src/bundle/Resources/config/services/stages.yaml index 8ca30d8f..708dc180 100644 --- a/src/bundle/Resources/config/services/stages.yaml +++ b/src/bundle/Resources/config/services/stages.yaml @@ -4,26 +4,26 @@ services: autoconfigure: true public: false - EzSystems\Behat\Subscriber\CreateContentDraft: + Ibexa\Behat\Subscriber\CreateContentDraft: tags: - kernel.event_subscriber - EzSystems\Behat\Subscriber\PublishDraft: + Ibexa\Behat\Subscriber\PublishDraft: tags: - kernel.event_subscriber - EzSystems\Behat\Subscriber\EditContent: + Ibexa\Behat\Subscriber\EditContent: tags: - kernel.event_subscriber - EzSystems\Behat\Subscriber\InitialStage: + Ibexa\Behat\Subscriber\InitialStage: tags: - kernel.event_subscriber - EzSystems\Behat\Subscriber\Review: + Ibexa\Behat\Subscriber\Review: tags: - kernel.event_subscriber - EzSystems\Behat\Subscriber\PublishInTheFuture: + Ibexa\Behat\Subscriber\PublishInTheFuture: tags: - kernel.event_subscriber diff --git a/src/bundle/Resources/config/services_dxp.yaml b/src/bundle/Resources/config/services_dxp.yaml index 42da3d0a..29f95baa 100644 --- a/src/bundle/Resources/config/services_dxp.yaml +++ b/src/bundle/Resources/config/services_dxp.yaml @@ -9,9 +9,9 @@ services: autoconfigure: true public: false - EzSystems\BehatBundle\Command\CreateExampleDataCommand: ~ + Ibexa\Bundle\Behat\Command\CreateExampleDataCommand: ~ - EzSystems\BehatBundle\Command\CreateExampleDataManagerCommand: + Ibexa\Bundle\Behat\Command\CreateExampleDataManagerCommand: arguments: - '%kernel.environment%' - '%kernel.project_dir%' From 36fff716b6e08c47dfeb30a309cf5c566828aa3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 16 Feb 2022 11:03:16 +0100 Subject: [PATCH 32/85] Run cross-rebranding --- behat_ibexa_commerce.yaml | 28 ++++---- behat_ibexa_content.yaml | 26 +++---- behat_ibexa_experience.yaml | 28 ++++---- behat_ibexa_oss.yaml | 28 ++++---- behat_suites.yml | 70 +++++++++---------- phpunit.xml | 2 +- .../API/ContentData/ContentDataProvider.php | 4 +- .../FieldTypeData/ImageAssetDataProvider.php | 2 +- .../ObjectRelationDataProvider.php | 4 +- .../FieldTypeData/RichTextDataProvider.php | 2 +- src/lib/API/Context/ContentContext.php | 4 +- src/lib/API/Context/ContentTypeContext.php | 2 +- src/lib/API/Context/LanguageContext.php | 2 +- .../LimitationParsersCollector.php | 6 +- src/lib/API/Context/RoleContext.php | 4 +- src/lib/API/Context/TrashContext.php | 4 +- src/lib/API/Context/UserContext.php | 4 +- src/lib/API/Facade/ContentFacade.php | 2 +- src/lib/API/Facade/RoleFacade.php | 4 +- src/lib/API/Facade/UserFacade.php | 2 +- .../Debug/Interactive/CollectionAssert.php | 2 +- .../Debug/Interactive/ElementAssert.php | 2 +- .../Browser/Context/AuthenticationContext.php | 2 +- src/lib/Browser/Context/BrowserContext.php | 4 +- src/lib/Browser/Context/DebuggingContext.php | 2 +- .../Element/Debug/Interactive/BaseElement.php | 2 +- .../Element/Debug/Interactive/Element.php | 2 +- .../Debug/Interactive/ElementCollection.php | 2 +- .../Element/Debug/Interactive/RootElement.php | 2 +- .../LocationAwareConfigurationEditor.php | 4 +- src/lib/Core/Context/ConfigurationContext.php | 2 +- src/lib/Subscriber/AbstractProcessStage.php | 2 +- src/lib/Subscriber/CreateContentDraft.php | 2 +- src/lib/Subscriber/EditContent.php | 2 +- src/lib/Subscriber/InitialStage.php | 2 +- src/lib/Subscriber/Review.php | 2 +- tests/lib/Core/Log/LogFileReaderTest.php | 2 +- 37 files changed, 133 insertions(+), 133 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index c362b455..62093921 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -13,14 +13,14 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\FileContext commerce: paths: - '%paths.base%/vendor/ibexa/scheduler/features' @@ -38,12 +38,12 @@ regression: tags: "~@broken&&@IbexaCommerce" contexts: - Behat\MinkExtension\Context\MinkContext - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\TrashContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\TrashContext + - Ibexa\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index aec3882a..e62c5b33 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -13,13 +13,13 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_content.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\FileContext content: paths: - '%paths.base%/vendor/ibexa/scheduler/features' @@ -31,12 +31,12 @@ regression: tags: "~@broken&&@IbexaContent" contexts: - Behat\MinkExtension\Context\MinkContext - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\TrashContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\TrashContext + - Ibexa\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 60481622..4228b7e4 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -17,14 +17,14 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\FileContext experience: paths: - '%paths.base%/vendor/ibexa/scheduler/features' @@ -40,12 +40,12 @@ regression: tags: "~@broken&&@IbexaExperience" contexts: - Behat\MinkExtension\Context\MinkContext - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\TrashContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\TrashContext + - Ibexa\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index 28e6a528..f86b3978 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -44,7 +44,7 @@ default: FriendsOfBehat\SymfonyExtension: bootstrap: 'tests/bootstrap.php' - EzSystems\BehatBundle\BehatExtension: + Ibexa\Bundle\Behat\IbexaExtension: mink: base_url: '%env(string:WEB_HOST)%' default_javascript_session: '%env(string:MINK_DEFAULT_SESSION)%' @@ -77,13 +77,13 @@ regression: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\FileContext oss: paths: - '%paths.base%/vendor/ibexa/admin-ui/features/personas' @@ -93,12 +93,12 @@ regression: tags: "~@broken&&@IbexaOSS" contexts: - Behat\MinkExtension\Context\MinkContext - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\TrashContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\TrashContext + - Ibexa\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext diff --git a/behat_suites.yml b/behat_suites.yml index 0ad7d773..339673bb 100644 --- a/behat_suites.yml +++ b/behat_suites.yml @@ -4,14 +4,14 @@ service: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/examples' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\ObjectStateContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\ObjectStateContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext + - Ibexa\Behat\Core\Context\ConfigurationContext setup: suites: @@ -19,63 +19,63 @@ setup: paths: - vendor/ezsystems/behatbundle/features/setup/volume/ contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext richtext-configuration: paths: - vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature - vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature contexts: - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\Core\Context\FileContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\FileContext personas: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' contexts: - - EzSystems\Behat\API\Context\ContentContext - - EzSystems\Behat\API\Context\ContentTypeContext - - EzSystems\Behat\API\Context\RoleContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\API\Context\UserContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\UserContext URIElement: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/URIElement.feature' contexts: - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\Core\Context\ConfigurationContext MapHost: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/MapHost.feature' contexts: - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\Core\Context\ConfigurationContext MapURI: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/MapURI.feature' contexts: - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\Core\Context\ConfigurationContext CompoundMapURIMapHost: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/CompoundMapURIMapHost.feature' contexts: - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\TestContext - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\Core\Context\ConfigurationContext multirepository: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/multirepository' contexts: - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\ConfigurationContext login-methods: paths: - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' contexts: - - EzSystems\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\Core\Context\ConfigurationContext diff --git a/phpunit.xml b/phpunit.xml index 39dabdab..c3ba5bd0 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,7 +7,7 @@ convertWarningsToExceptions="true" colors="true"> - + tests/ diff --git a/src/lib/API/ContentData/ContentDataProvider.php b/src/lib/API/ContentData/ContentDataProvider.php index 2bbaae13..6f39f708 100644 --- a/src/lib/API/ContentData/ContentDataProvider.php +++ b/src/lib/API/ContentData/ContentDataProvider.php @@ -24,10 +24,10 @@ class ContentDataProvider private $contentService; - /** @var \EzSystems\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface[] */ + /** @var \Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface[] */ private $fieldTypeDataProviders; - /** @var \EzSystems\Behat\API\ContentData\RandomDataGenerator */ + /** @var \Ibexa\Behat\API\ContentData\RandomDataGenerator */ private $randomDataGenerator; public function __construct(ContentTypeService $contentTypeService, ContentService $contentService, RandomDataGenerator $randomDataGenerator) diff --git a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php index 7f46a7f7..02b12045 100644 --- a/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ImageAssetDataProvider.php @@ -29,7 +29,7 @@ class ImageAssetDataProvider extends AbstractFieldTypeDataProvider private $imageDataProvider; /** - * @var \EzSystems\Behat\Core\Behat\ArgumentParser + * @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; diff --git a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php index 63dd90b7..af9ad203 100644 --- a/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/ObjectRelationDataProvider.php @@ -17,7 +17,7 @@ class ObjectRelationDataProvider implements FieldTypeDataProviderInterface { - /** @var \EzSystems\Behat\API\Facade\SearchFacade */ + /** @var \Ibexa\Behat\API\Facade\SearchFacade */ protected $searchFacade; /** @var \Ibexa\Contracts\Core\Repository\ContentService */ @@ -29,7 +29,7 @@ class ObjectRelationDataProvider implements FieldTypeDataProviderInterface /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(SearchFacade $searchFacade, ContentService $contentService, LocationService $locationSerice, URLAliasService $urlAliasSerivce, ArgumentParser $argumentParser) diff --git a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php index a1b5210c..82033f0e 100644 --- a/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/RichTextDataProvider.php @@ -25,7 +25,7 @@ class RichTextDataProvider extends AbstractFieldTypeDataProvider
'; /** - * @var \EzSystems\Behat\API\Facade\SearchFacade + * @var \Ibexa\Behat\API\Facade\SearchFacade */ private $searchFacade; diff --git a/src/lib/API/Context/ContentContext.php b/src/lib/API/Context/ContentContext.php index 7c25aed9..a541cc08 100644 --- a/src/lib/API/Context/ContentContext.php +++ b/src/lib/API/Context/ContentContext.php @@ -15,10 +15,10 @@ class ContentContext implements Context { - /** @var \EzSystems\Behat\API\Facade\ContentFacade */ + /** @var \Ibexa\Behat\API\Facade\ContentFacade */ private $contentFacade; - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(ContentFacade $contentFacade, ArgumentParser $argumentParser) diff --git a/src/lib/API/Context/ContentTypeContext.php b/src/lib/API/Context/ContentTypeContext.php index 8e549304..35388f82 100644 --- a/src/lib/API/Context/ContentTypeContext.php +++ b/src/lib/API/Context/ContentTypeContext.php @@ -15,7 +15,7 @@ class ContentTypeContext implements Context { - /** @var \EzSystems\Behat\API\Facade\ContentTypeFacade */ + /** @var \Ibexa\Behat\API\Facade\ContentTypeFacade */ private $contentTypeFacade; public function __construct(ContentTypeFacade $contentTypeFacade) diff --git a/src/lib/API/Context/LanguageContext.php b/src/lib/API/Context/LanguageContext.php index b5c5e1ee..cf773d49 100644 --- a/src/lib/API/Context/LanguageContext.php +++ b/src/lib/API/Context/LanguageContext.php @@ -14,7 +14,7 @@ class LanguageContext implements Context { /** - * @var \EzSystems\Behat\API\Facade\LanguageFacade + * @var \Ibexa\Behat\API\Facade\LanguageFacade */ private $languageFacade; diff --git a/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php b/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php index 0cc36eca..9dc2fda4 100644 --- a/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php +++ b/src/lib/API/Context/LimitationParser/LimitationParsersCollector.php @@ -10,11 +10,11 @@ class LimitationParsersCollector { - /** @var \EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface[] */ + /** @var \Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface[] */ private $limitationParsers; /** - * @param \EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface[] $limitationParsers + * @param \Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface[] $limitationParsers */ public function __construct(array $limitationParsers = []) { @@ -27,7 +27,7 @@ public function addLimitationParser(LimitationParserInterface $limitationParser) } /** - * @return \EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface[] + * @return \Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface[] */ public function getLimitationParsers(): array { diff --git a/src/lib/API/Context/RoleContext.php b/src/lib/API/Context/RoleContext.php index 67b94f52..8ea3fe92 100644 --- a/src/lib/API/Context/RoleContext.php +++ b/src/lib/API/Context/RoleContext.php @@ -15,10 +15,10 @@ class RoleContext implements Context { - /** @var \EzSystems\Behat\API\Facade\RoleFacade */ + /** @var \Ibexa\Behat\API\Facade\RoleFacade */ private $roleFacade; - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(RoleFacade $roleFacade, ArgumentParser $argumentParser) diff --git a/src/lib/API/Context/TrashContext.php b/src/lib/API/Context/TrashContext.php index 44058010..204e95f2 100644 --- a/src/lib/API/Context/TrashContext.php +++ b/src/lib/API/Context/TrashContext.php @@ -14,10 +14,10 @@ class TrashContext implements Context { - /** @var \EzSystems\Behat\API\Facade\TrashFacade */ + /** @var \Ibexa\Behat\API\Facade\TrashFacade */ private $trashFacade; - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(TrashFacade $trashFacade, ArgumentParser $argumentParser) diff --git a/src/lib/API/Context/UserContext.php b/src/lib/API/Context/UserContext.php index 75536a0b..65ee035a 100644 --- a/src/lib/API/Context/UserContext.php +++ b/src/lib/API/Context/UserContext.php @@ -15,10 +15,10 @@ class UserContext implements Context { - /** @var \EzSystems\Behat\API\Facade\UserFacade */ + /** @var \Ibexa\Behat\API\Facade\UserFacade */ private $userFacade; - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(UserFacade $userFacade, ArgumentParser $argumentParser) diff --git a/src/lib/API/Facade/ContentFacade.php b/src/lib/API/Facade/ContentFacade.php index aadde38d..b3daa4a5 100644 --- a/src/lib/API/Facade/ContentFacade.php +++ b/src/lib/API/Facade/ContentFacade.php @@ -30,7 +30,7 @@ class ContentFacade /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; - /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ + /** @var \Ibexa\Behat\API\ContentData\ContentDataProvider */ private $contentDataProvider; /** @var \FOS\HttpCacheBundle\CacheManager */ diff --git a/src/lib/API/Facade/RoleFacade.php b/src/lib/API/Facade/RoleFacade.php index f3109af9..29cc44c6 100644 --- a/src/lib/API/Facade/RoleFacade.php +++ b/src/lib/API/Facade/RoleFacade.php @@ -17,7 +17,7 @@ class RoleFacade /** @var \Ibexa\Contracts\Core\Repository\RoleService */ private $roleService; - /** @var \EzSystems\Behat\API\Context\LimitationParser\LimitationParsersCollector */ + /** @var \Ibexa\Behat\API\Context\LimitationParser\LimitationParsersCollector */ private $limitationParsersCollector; public function __construct(RoleService $roleService, LimitationParsersCollector $limitationParsersCollector) @@ -62,7 +62,7 @@ public function roleExist($roleName): bool } /** - * @return \EzSystems\Behat\API\Context\LimitationParser\LimitationParserInterface[] + * @return \Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface[] */ public function getLimitationParsers(): array { diff --git a/src/lib/API/Facade/UserFacade.php b/src/lib/API/Facade/UserFacade.php index 324f1886..6d343d25 100644 --- a/src/lib/API/Facade/UserFacade.php +++ b/src/lib/API/Facade/UserFacade.php @@ -39,7 +39,7 @@ class UserFacade private $searchService; /** - * @var \EzSystems\Behat\API\ContentData\RandomDataGenerator + * @var \Ibexa\Behat\API\ContentData\RandomDataGenerator */ private $randomDataGenerator; diff --git a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php index c4e34583..cf2c1d3c 100644 --- a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php +++ b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php @@ -8,7 +8,7 @@ namespace Ibexa\Behat\Browser\Assert\Debug\Interactive; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\CollectionAssertInterface; use Ibexa\Behat\Browser\Element\ElementCollectionInterface; use PHPUnit\Framework\ExpectationFailedException; diff --git a/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php b/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php index eddfddf8..65c444f6 100644 --- a/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php +++ b/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php @@ -8,7 +8,7 @@ namespace Ibexa\Behat\Browser\Assert\Debug\Interactive; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; use Ibexa\Behat\Browser\Element\ElementInterface; use PHPUnit\Framework\ExpectationFailedException; diff --git a/src/lib/Browser/Context/AuthenticationContext.php b/src/lib/Browser/Context/AuthenticationContext.php index 115246c0..61ab5401 100644 --- a/src/lib/Browser/Context/AuthenticationContext.php +++ b/src/lib/Browser/Context/AuthenticationContext.php @@ -9,7 +9,7 @@ namespace Ibexa\Behat\Browser\Context; use Behat\MinkExtension\Context\RawMinkContext; -use EzSystems\Behat\API\ContentData\FieldTypeData\PasswordProvider; +use Ibexa\Behat\API\ContentData\FieldTypeData\PasswordProvider; use Ibexa\Behat\Browser\Page\LoginPage; use Ibexa\Behat\Browser\Page\RedirectLoginPage; diff --git a/src/lib/Browser/Context/BrowserContext.php b/src/lib/Browser/Context/BrowserContext.php index 30c71e23..255c3d75 100644 --- a/src/lib/Browser/Context/BrowserContext.php +++ b/src/lib/Browser/Context/BrowserContext.php @@ -11,12 +11,12 @@ use Behat\Gherkin\Node\TableNode; use Behat\MinkExtension\Context\RawMinkContext; use DMore\ChromeDriver\ChromeDriver; -use EzSystems\Behat\Core\Behat\ArgumentParser; +use Ibexa\Behat\Core\Behat\ArgumentParser; use PHPUnit\Framework\Assert; class BrowserContext extends RawMinkContext { - /** @var \EzSystems\Behat\Core\Behat\ArgumentParser */ + /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */ private $argumentParser; public function __construct(ArgumentParser $argumentParser) diff --git a/src/lib/Browser/Context/DebuggingContext.php b/src/lib/Browser/Context/DebuggingContext.php index 94d223b0..b757d065 100644 --- a/src/lib/Browser/Context/DebuggingContext.php +++ b/src/lib/Browser/Context/DebuggingContext.php @@ -14,7 +14,7 @@ use Behat\Behat\Hook\Scope\BeforeStepScope; use Behat\MinkExtension\Context\RawMinkContext; use Behat\Testwork\Tester\Result\TestResult; -use EzSystems\Behat\Core\Log\TestLogProvider; +use Ibexa\Behat\Core\Log\TestLogProvider; use Psr\Log\LoggerInterface; class DebuggingContext extends RawMinkContext diff --git a/src/lib/Browser/Element/Debug/Interactive/BaseElement.php b/src/lib/Browser/Element/Debug/Interactive/BaseElement.php index 09743a71..31e9ae36 100644 --- a/src/lib/Browser/Element/Debug/Interactive/BaseElement.php +++ b/src/lib/Browser/Element/Debug/Interactive/BaseElement.php @@ -8,7 +8,7 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Element\BaseElementInterface; use Ibexa\Behat\Browser\Element\Condition\ConditionInterface; use Ibexa\Behat\Browser\Element\ElementCollectionInterface; diff --git a/src/lib/Browser/Element/Debug/Interactive/Element.php b/src/lib/Browser/Element/Debug/Interactive/Element.php index ad049656..ff1d6ce6 100644 --- a/src/lib/Browser/Element/Debug/Interactive/Element.php +++ b/src/lib/Browser/Element/Debug/Interactive/Element.php @@ -9,7 +9,7 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; use Exception; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\Debug\Interactive\ElementAssert as InteractiveElementAssert; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; use Ibexa\Behat\Browser\Element\ElementInterface; diff --git a/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php b/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php index 9f581d7d..95b60f8d 100644 --- a/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php +++ b/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php @@ -8,7 +8,7 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\CollectionAssertInterface; use Ibexa\Behat\Browser\Assert\Debug\Interactive\CollectionAssert as InteractiveElementCollectionAssert; use Ibexa\Behat\Browser\Element\Criterion\CriterionInterface; diff --git a/src/lib/Browser/Element/Debug/Interactive/RootElement.php b/src/lib/Browser/Element/Debug/Interactive/RootElement.php index 68c1b9a2..74357f5b 100644 --- a/src/lib/Browser/Element/Debug/Interactive/RootElement.php +++ b/src/lib/Browser/Element/Debug/Interactive/RootElement.php @@ -9,7 +9,7 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; use Exception; -use EzSystems\Behat\Core\Debug\InteractiveDebuggerTrait; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Element\RootElementInterface; final class RootElement extends BaseElement implements RootElementInterface diff --git a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php index 3d1d2fbc..f2d14c71 100644 --- a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php +++ b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php @@ -12,10 +12,10 @@ class LocationAwareConfigurationEditor implements ConfigurationEditorInterface { - /** @var \EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface */ + /** @var \Ibexa\Behat\Core\Configuration\ConfigurationEditorInterface */ private $innerConfigurationEditor; - /** @var \EzSystems\Behat\API\Facade\ContentFacade */ + /** @var \Ibexa\Behat\API\Facade\ContentFacade */ private $contentFacade; public function __construct(ConfigurationEditorInterface $innerConfigurationEditor, ContentFacade $contentFacade) diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index bdf793e4..099fe438 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -27,7 +27,7 @@ class ConfigurationContext implements Context private $projectDir; /** - * @var \EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface + * @var \Ibexa\Behat\Core\Configuration\ConfigurationEditorInterface */ private $configurationEditor; diff --git a/src/lib/Subscriber/AbstractProcessStage.php b/src/lib/Subscriber/AbstractProcessStage.php index 8f4adeae..3d3872f8 100644 --- a/src/lib/Subscriber/AbstractProcessStage.php +++ b/src/lib/Subscriber/AbstractProcessStage.php @@ -33,7 +33,7 @@ abstract class AbstractProcessStage /** @var \Symfony\Component\EventDispatcher\EventDispatcher */ private $eventDispatcher; - /** @var \EzSystems\Behat\API\ContentData\RandomDataGenerator */ + /** @var \Ibexa\Behat\API\ContentData\RandomDataGenerator */ protected $randomDataGenerator; public function __construct( diff --git a/src/lib/Subscriber/CreateContentDraft.php b/src/lib/Subscriber/CreateContentDraft.php index 3ef2be8b..cdffd36f 100644 --- a/src/lib/Subscriber/CreateContentDraft.php +++ b/src/lib/Subscriber/CreateContentDraft.php @@ -21,7 +21,7 @@ class CreateContentDraft extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \EzSystems\Behat\API\Facade\ContentFacade */ + /** @var \Ibexa\Behat\API\Facade\ContentFacade */ private $contentFacade; /** @var \Ibexa\Workflow\Behat\Facade\WorkflowFacade */ diff --git a/src/lib/Subscriber/EditContent.php b/src/lib/Subscriber/EditContent.php index 0bf5b28a..e0d4445f 100644 --- a/src/lib/Subscriber/EditContent.php +++ b/src/lib/Subscriber/EditContent.php @@ -22,7 +22,7 @@ class EditContent extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ + /** @var \Ibexa\Behat\API\ContentData\ContentDataProvider */ private $contentDataProvider; /** @var \Ibexa\Contracts\Core\Repository\ContentService */ diff --git a/src/lib/Subscriber/InitialStage.php b/src/lib/Subscriber/InitialStage.php index e7c0c613..2743fdf1 100644 --- a/src/lib/Subscriber/InitialStage.php +++ b/src/lib/Subscriber/InitialStage.php @@ -21,7 +21,7 @@ class InitialStage extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \EzSystems\Behat\API\Facade\SearchFacade */ + /** @var \Ibexa\Behat\API\Facade\SearchFacade */ private $searchFacade; protected function getTransitions(): array diff --git a/src/lib/Subscriber/Review.php b/src/lib/Subscriber/Review.php index 30066b16..5c814532 100644 --- a/src/lib/Subscriber/Review.php +++ b/src/lib/Subscriber/Review.php @@ -22,7 +22,7 @@ class Review extends AbstractProcessStage implements EventSubscriberInterface { - /** @var \EzSystems\Behat\API\ContentData\ContentDataProvider */ + /** @var \Ibexa\Behat\API\ContentData\ContentDataProvider */ private $contentDataProvider; /** @var \Ibexa\Contracts\Core\Repository\ContentService */ diff --git a/tests/lib/Core/Log/LogFileReaderTest.php b/tests/lib/Core/Log/LogFileReaderTest.php index 6797a034..80b8c4c1 100644 --- a/tests/lib/Core/Log/LogFileReaderTest.php +++ b/tests/lib/Core/Log/LogFileReaderTest.php @@ -24,7 +24,7 @@ class LogFileReaderTest extends TestCase /** @var \org\bovigo\vfs\vfsStreamDirectory */ private $fileSystemRoot; - /** @var \EzSystems\Behat\Core\Log\LogFileReader */ + /** @var \Ibexa\Behat\Core\Log\LogFileReader */ private $logReader; public function setUp(): void From 2bb361222f093d53658930f41946948ef8cbe1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 16 Feb 2022 12:36:18 +0100 Subject: [PATCH 33/85] Manual changes --- README.md | 4 +- behat_ibexa_commerce.yaml | 8 +- behat_ibexa_content.yaml | 8 +- behat_ibexa_experience.yaml | 8 +- behat_ibexa_oss.yaml | 10 +- behat_suites.yml | 22 +- bin/.travis/trigger_ci.sh | 172 --------------- bin/ezreport | 2 +- composer.json | 2 +- doc/features.md | 6 +- features/examples/content.feature | 6 +- .../CreateExampleDataManagerCommand.php | 2 +- .../Command/GetPullRequestDataCommand.php | 203 ------------------ .../Compiler/FieldTypeDataProviderPass.php | 2 +- .../IbexaBehatExtension.php | 10 +- src/bundle/IbexaBehatBundle.php | 2 - src/bundle/IbexaExtension.php | 10 +- .../BehatSiteAccessInitializer.php | 4 +- src/bundle/Resources/config/routing.yaml | 2 +- src/bundle/Resources/config/services.yaml | 4 - .../services/fieldtype_data_providers.yaml | 4 - .../config/services/limitation_parsers.yaml | 4 - .../Resources/encore/ez.config.manager.js | 8 +- .../views/tests/cache/embed_esi.html.twig | 4 +- .../views/tests/cache/embed_no_esi.html.twig | 4 +- .../views/tests/cache/embedded.html.twig | 2 +- .../FieldTypeDataProviderInterface.php | 2 - .../LimitationParserInterface.php | 2 - src/lib/Core/Context/FileContext.php | 2 +- src/lib/Core/Log/TestLogProvider.php | 1 - .../SiteFactory/pagelayout1.html.twig | 6 +- .../SiteFactory/pagelayout10.html.twig | 6 +- .../SiteFactory/pagelayout11.html.twig | 6 +- .../SiteFactory/pagelayout12.html.twig | 6 +- .../SiteFactory/pagelayout13.html.twig | 6 +- .../SiteFactory/pagelayout14.html.twig | 6 +- .../SiteFactory/pagelayout15.html.twig | 6 +- .../SiteFactory/pagelayout16.html.twig | 6 +- .../SiteFactory/pagelayout17.html.twig | 6 +- .../SiteFactory/pagelayout18.html.twig | 6 +- .../SiteFactory/pagelayout19.html.twig | 6 +- .../SiteFactory/pagelayout2.html.twig | 6 +- .../SiteFactory/pagelayout20.html.twig | 6 +- .../SiteFactory/pagelayout3.html.twig | 6 +- .../SiteFactory/pagelayout4.html.twig | 6 +- .../SiteFactory/pagelayout5.html.twig | 6 +- .../SiteFactory/pagelayout6.html.twig | 6 +- .../SiteFactory/pagelayout7.html.twig | 6 +- .../SiteFactory/pagelayout8.html.twig | 6 +- .../SiteFactory/pagelayout9.html.twig | 6 +- 50 files changed, 127 insertions(+), 513 deletions(-) delete mode 100755 bin/.travis/trigger_ci.sh delete mode 100644 src/bundle/Command/GetPullRequestDataCommand.php diff --git a/README.md b/README.md index b0705a25..eeb9ecf9 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ This package is part of [Ibexa DXP](https://ibexa.co). [Install Ibexa DXP](https://doc.ibexa.co/en/latest/install/) and then install this package to use it: ``` -composer require --dev ezsystems/behatbundle --no-scripts --no-plugins -composer sync-recipes ezsystems/behatbundle --force -v +composer require --dev ibexa/behat --no-scripts --no-plugins +composer sync-recipes ibexa/behat --force -v ``` For more information about BehatBundle, see: diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 62093921..64e964d4 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -7,11 +7,11 @@ regression: suites: setup-commerce: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' + - '%paths.base%/vendor/ibexa/behat/features/personas' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index e62c5b33..edfb107f 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -7,11 +7,11 @@ regression: suites: setup-content: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' + - '%paths.base%/vendor/ibexa/behat/features/personas' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_content.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 4228b7e4..03b3c40f 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -11,11 +11,11 @@ regression: suites: setup-experience: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' + - '%paths.base%/vendor/ibexa/behat/features/personas' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index f86b3978..8a545d79 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -1,5 +1,5 @@ imports: - - vendor/ezsystems/behatbundle/behat_suites.yml + - vendor/ibexa/behat/behat_suites.yml - vendor/ibexa/admin-ui/behat_suites.yml - vendor/ibexa/content-forms/behat_suites.yml - vendor/ibexa/http-cache/behat_suites.yml @@ -72,10 +72,10 @@ regression: suites: setup-oss: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature' - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/personas' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_suites.yml b/behat_suites.yml index 339673bb..a69184e2 100644 --- a/behat_suites.yml +++ b/behat_suites.yml @@ -2,7 +2,7 @@ service: suites: examples: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/examples' + - '%paths.base%/vendor/ibexa/behat/features/examples' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -17,7 +17,7 @@ setup: suites: volume-testing: paths: - - vendor/ezsystems/behatbundle/features/setup/volume/ + - vendor/ibexa/behat/features/setup/volume/ contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -27,14 +27,14 @@ setup: - Ibexa\Behat\API\Context\UserContext richtext-configuration: paths: - - vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature - - vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature + - vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature + - vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature contexts: - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext personas: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/personas' + - '%paths.base%/vendor/ibexa/behat/features/personas' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -43,39 +43,39 @@ setup: - Ibexa\Behat\API\Context\UserContext URIElement: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/URIElement.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/siteaccessMatcher/URIElement.feature' contexts: - Ibexa\Behat\API\Context\LanguageContext - Ibexa\Behat\API\Context\TestContext - Ibexa\Behat\Core\Context\ConfigurationContext MapHost: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/MapHost.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/siteaccessMatcher/MapHost.feature' contexts: - Ibexa\Behat\API\Context\LanguageContext - Ibexa\Behat\API\Context\TestContext - Ibexa\Behat\Core\Context\ConfigurationContext MapURI: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/MapURI.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/siteaccessMatcher/MapURI.feature' contexts: - Ibexa\Behat\API\Context\LanguageContext - Ibexa\Behat\API\Context\TestContext - Ibexa\Behat\Core\Context\ConfigurationContext CompoundMapURIMapHost: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/siteaccessMatcher/CompoundMapURIMapHost.feature' + - '%paths.base%/vendor/ibexa/behat/features/setup/siteaccessMatcher/CompoundMapURIMapHost.feature' contexts: - Ibexa\Behat\API\Context\LanguageContext - Ibexa\Behat\API\Context\TestContext - Ibexa\Behat\Core\Context\ConfigurationContext multirepository: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/multirepository' + - '%paths.base%/vendor/ibexa/behat/features/setup/multirepository' contexts: - Ibexa\Behat\Core\Context\ConfigurationContext login-methods: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' contexts: - Ibexa\Behat\Core\Context\ConfigurationContext diff --git a/bin/.travis/trigger_ci.sh b/bin/.travis/trigger_ci.sh deleted file mode 100755 index b271867d..00000000 --- a/bin/.travis/trigger_ci.sh +++ /dev/null @@ -1,172 +0,0 @@ -#!/bin/bash - -# Run a regression build on Travis using multiple dependencies (Pull Requests) -# -# How to use: -# - run the script in "behat" Symfony environment -# - specify the number of Pull Requests and paste GitHub links to them -# -# Requires GitHub CLI tool ("hub"): https://github.com/github/hub - -set -e - -if [ "$APP_ENV" != "behat" ]; then - echo 'Please run the script in "behat" Symfony env.' - echo 'You can run "export APP_ENV=behat" in the command line to achieve it.' - echo 'Aborted.' - exit 1 -fi - -if ! [ -x "$(command -v hub)" ]; then - echo '"hub" command is not available.' - echo 'Install the GitHub CLI client by going to https://github.com/github/hub and rerun the script.' - echo "If you're accessing your remotes using https, please configure hub running: git config --global hub.protocol https" - echo 'Aborted.' - exit 1 -fi - -# Step 0: Setup variables -CONST_RANDOM_STRING=$(uuidgen) -prLinks=() -composerDependencyStrings=() -REPOSITORY_URLS=() -GITHUB_OAUTH_TOKEN=$(composer config github-oauth.github.com --global) -TARGET_METAREPOSITORY_BRANCH="" -TARGET_PAGE_BUILDER_BRANCH="" -HAS_PAGE_BUILDER_DEPENDENCY=0 -UNDEFINED_VALUE="undefined" - -# Step 1: ask for number of PRs and a link for each PR - -read -p 'Number of pull requests: ' numberOfDependencies - -for ((n=0;n<$numberOfDependencies;n++)); do - read -p 'Pull request link: ' link - prLinks+=("$link") -done - -echo 'Adding dependencies to Composer...' - -# Step 2: Parse data from the Pull Request -for i in "${prLinks[@]}" -do - read -r -a VALUES <<< "$(php bin/console ibexa:behat:get-pull-request-data $i $GITHUB_OAUTH_TOKEN)" - - REPOSITORY_URLS+=("${VALUES[0]}") - - BRANCH_NAME="${VALUES[1]}" - BRANCH_ALIAS="${VALUES[2]}" - REPOSITORY_NAME="${VALUES[3]}" - - if [ "${REPOSITORY_NAME}" == "ezplatform-page-builder" ] ; then - # We need to detect Page Builder because the regression is run by creating a PR in that repo - if there is a PR already we don't need to create a new one - HAS_PAGE_BUILDER_DEPENDENCY=1 - PAGE_BUILDER_PR_BRANCH=$BRANCH_NAME - elif [ "${HAS_PAGE_BUILDER_DEPENDENCY}" == 0 ]; then - # If Page Builder dependency has been detected for earlier links do not overwrite it - PAGE_BUILDER_PR_BRANCH=$CONST_RANDOM_STRING - fi - - composerDependencyString=$(printf "ezsystems/%s:dev-%s as %s" $REPOSITORY_NAME $BRANCH_NAME $BRANCH_ALIAS) - composerDependencyStrings+=("$composerDependencyString") - - PARSED_PR_METAREPOSITORY_BRANCH="${VALUES[4]}" - PARSED_PR_PAGE_BUILDER_BRANCH="${VALUES[5]}" - - if [ "${PARSED_PR_METAREPOSITORY_BRANCH}" != "${UNDEFINED_VALUE}" ] ; then - TARGET_METAREPOSITORY_BRANCH=$PARSED_PR_METAREPOSITORY_BRANCH - fi - - if [ "${PARSED_PR_PAGE_BUILDER_BRANCH}" != "${UNDEFINED_VALUE}" ] ; then - TARGET_PAGE_BUILDER_BRANCH=$PARSED_PR_PAGE_BUILDER_BRANCH - fi -done - -if [ "${TARGET_METAREPOSITORY_BRANCH}" == "" ] || [ "${TARGET_PAGE_BUILDER_BRANCH}" == "" ] ; then - echo 'Could not determine target metarepository or Page Builder branch. Aborting.' - exit 1 -fi - -# Step 3: Prepare ezplatfom-ee repository -rm -rf regression_setup -mkdir -p regression_setup && cd regression_setup -hub clone --quiet ezsystems/ezplatform-ee -b $TARGET_METAREPOSITORY_BRANCH -cd ezplatform-ee -git remote remove origin 2> /dev/null -METAREPOSITORY_BRANCH_NAME=$CONST_RANDOM_STRING -git checkout -b $METAREPOSITORY_BRANCH_NAME --quiet - -# Step 4: Execute Composer commands in ezplatform-ee - -for i in "${REPOSITORY_URLS[@]}" -do - composer config repositories.$(uuidgen) vcs "$i" -done - -for i in "${composerDependencyStrings[@]}" -do - printf "Adding dependency: %s\n" "$i" - composer require --no-update --no-progress --no-scripts "$i" -done - -echo -e 'Dependencies have been added \033[0;32m✔\033[0m' - -# Step 5: Push the metarepo - -echo 'Preparing metarepository branch...' -git add composer.json -git commit -m "[Travis] Added dependencies" --quiet -hub remote add regression-remote mnocon/ezplatform-ee -git push --set-upstream regression-remote $METAREPOSITORY_BRANCH_NAME --quiet > /dev/null -cd .. - -echo -e 'Prepared a branch with dependencies using ezplatform-ee repository \033[0;32m✔\033[0m' - -## Step 6: Clone Page Builder repository - -if [ "${HAS_PAGE_BUILDER_DEPENDENCY}" == 1 ] ; then - # If there is a Page Builder dependency then we need to add a commit there, not to a new branch - hub clone --quiet ezsystems/ezplatform-page-builder -b $PAGE_BUILDER_PR_BRANCH - cd ezplatform-page-builder -else - # Without an existing Page Builder branch we base a new branch on the target branch - hub clone --quiet ezsystems/ezplatform-page-builder -b $TARGET_PAGE_BUILDER_BRANCH - cd ezplatform-page-builder - git checkout -b $PAGE_BUILDER_PR_BRANCH --quiet || exit 1 - git branch -D $TARGET_PAGE_BUILDER_BRANCH --quiet || exit 1 -fi - -# Step 7: Prepare a commit in Page Builder - -sed -i.bak -e 's/https:\/\/github.com\/ezsystems\/ezplatform-ee.git/https:\/\/github.com\/mnocon\/ezplatform-ee.git/g' .travis.yml -composer config extra._ezplatform_branch_for_behat_tests $METAREPOSITORY_BRANCH_NAME -git add composer.json .travis.yml -git commit -m "[TMP] Run regression" --quiet - -# Step 8: Push to Page Builder. Open existing PR or create a new one -printf "About to push in Page Builder to branch \033[1;32m%s\033[0m\n" "$(git rev-parse --abbrev-ref HEAD)" -if [ "${HAS_PAGE_BUILDER_DEPENDENCY}" == 1 ] ; then - echo -e "\033[1;33mThis is an existing branch that contains work done by someone else.\033[0m" - echo -e "\033[1;33mRemember to talk with them that you are adding a commit to their branch and clearly mark the Pull Request as one containing temporary changes.\033[0m" -fi -read -p "Do you want to continue? [y/N]:" -r -if [[ ! $REPLY =~ ^[Yy] ]] ; then - echo -e '\033[0;31mAborted.\033[0m' - exit 1 -fi - -# Push to Page Builder -git push --set-upstream origin $PAGE_BUILDER_PR_BRANCH --quiet > /dev/null -echo -e 'Pushed to Page Builder repository \033[0;32m✔\033[0m' - -if [ "${HAS_PAGE_BUILDER_DEPENDENCY}" == 1 ] ; then - # Open existing PR - echo -e '\033[1;33mOpening existing Pull Request. Remember to indicate that it contains temporary commit.\033[0m' - hub pr show -else - # Without an existing Page Builder branch we need to create a new PR - hub pull-request -b $TARGET_PAGE_BUILDER_BRANCH -m "[DON'T MERGE] Running regression tests" -m "Add your description here." -l "Work in progress" --browse - echo -e 'Prepared a Pull Request in Page Builder triggering the build \033[0;32m✔\033[0m' -fi - -echo -e 'Script finished \033[0;32m✔\033[0m' diff --git a/bin/ezreport b/bin/ezreport index 698fc098..8bdc498e 100755 --- a/bin/ezreport +++ b/bin/ezreport @@ -8,7 +8,7 @@ # bin/ezreport -i=path/to/sshkey -r=BehatBundle # Reports generated in this way will be hosted on the server in BehatBundle/manual/time_stamp directory -SSH_KEY_PATH='vendor/ezsystems/behatbundle/bin/.travis/rsa_allure' +SSH_KEY_PATH='vendor/ibexa/behat/bin/.travis/rsa_allure' ALLURE_BUILD_PATH='build/allure/' HOST_NAME='allure.ez.no' diff --git a/composer.json b/composer.json index a04f69bf..22398edf 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "authors": [ { "name": "eZ Publish dev-team & eZ Community", - "homepage": "https://github.com/ezsystems/BehatBundle" + "homepage": "https://github.com/ibexa/behat" } ], "require": { diff --git a/doc/features.md b/doc/features.md index 832dd566..0effed54 100644 --- a/doc/features.md +++ b/doc/features.md @@ -3,7 +3,7 @@ ## Example usages ### API examples -See [BehatBundle examples](https://github.com/ezsystems/BehatBundle/tree/master/features/examples) to see how to use Behat sentences to: +See [BehatBundle examples](https://github.com/ibexa/behat/tree/master/features/examples) to see how to use Behat sentences to: - create Languages, Content items, Content Types - create Users with complex permissions - create given YAML configuration @@ -28,11 +28,11 @@ Before you start using that you need to inject the [drag-mock script](../Resourc ### SiteAccess awareness -With `EzBehatExtension` enabled Behat becomes SiteAccess aware. The SiteAccess used can be specified using `EZPLATFORM_SITEACCESS` environment variable, otherwise the default SiteAccess will be used. +With `IbexaExtension` enabled Behat becomes SiteAccess aware. The SiteAccess used can be specified using `IBEXA_SITEACCESS` environment variable, otherwise the default SiteAccess will be used. ## Debugging tools -Use the `Ibexa\Behat\Browser\Context\Hooks` Context class to access browser and server logs after Scenario failure, which combined with the screenshots feature makes debugging failures (even on CI) much easier. +Use the `Ibexa\Behat\Browser\Context\DebuggingContext` Context class to access browser and server logs after Scenario failure, which combined with the screenshots feature makes debugging failures (even on CI) much easier. ## Default testing configuration diff --git a/features/examples/content.feature b/features/examples/content.feature index ee698bc1..820f3dcc 100644 --- a/features/examples/content.feature +++ b/features/examples/content.feature @@ -78,9 +78,9 @@ Feature: Example scenarios showing how to use steps involving Languages, Content | Date and time CT2 | DateAndTimeCT2 | Date and time | 2018-12-31 13:55:00 | | | Content relation CT2 | ContentRelationCT2 | Content relation (single) | /RelationFolder1 | | | Content relations CT2 | ContentRelationsCT2 | Content relations (multiple) | RelationFolder1,/RelationFolder2 | | - | Image CT2 | ImageCT2 | Image | vendor/ezsystems/behatbundle/src/lib/Data/Images/small1.jpg | | - | File CT2 | FileCT2 | File | vendor/ezsystems/behatbundle/src/lib/Data/Files/file1.txt | | - | Media CT2 | MediaCT2 | Media | vendor/ezsystems/behatbundle/src/lib/Data/Videos/video1.mp4 | | + | Image CT2 | ImageCT2 | Image | vendor/ibexa/behat/src/lib/Data/Images/small1.jpg | | + | File CT2 | FileCT2 | File | vendor/ibexa/behat/src/lib/Data/Files/file1.txt | | + | Media CT2 | MediaCT2 | Media | vendor/ibexa/behat/src/lib/Data/Videos/video1.mp4 | | | Matrix CT2 | MatrixCT2 | Matrix | col1:col2:col3,Ala:miała:kota,Szpak:dziobał:bociana,Bociana:dziobał:szpak | Min_rows:2,Columns:col1-col2-col3 | | Selection CT2 | SelectionCT2 | Selection | 1,2 | is_multiple:true,options:Option1-Option2-Option3 | | Image Asset CT2 | ImageAssetCT2 | Image Asset | /Media/Images/ImageForImageAsset | | diff --git a/src/bundle/Command/CreateExampleDataManagerCommand.php b/src/bundle/Command/CreateExampleDataManagerCommand.php index 948a6ba0..403f403e 100644 --- a/src/bundle/Command/CreateExampleDataManagerCommand.php +++ b/src/bundle/Command/CreateExampleDataManagerCommand.php @@ -118,7 +118,7 @@ private function executeCommand(OutputInterface $output, $cmd, float $timeout = private function getData() { - $data = Yaml::parseFile(sprintf('%s/vendor/ezsystems/behatbundle/features/setup/volume/data.yaml', $this->projectDir)); + $data = Yaml::parseFile(sprintf('%s/vendor/ibexa/behat/features/setup/volume/data.yaml', $this->projectDir)); return $data['countries']; } diff --git a/src/bundle/Command/GetPullRequestDataCommand.php b/src/bundle/Command/GetPullRequestDataCommand.php deleted file mode 100644 index 2157aa73..00000000 --- a/src/bundle/Command/GetPullRequestDataCommand.php +++ /dev/null @@ -1,203 +0,0 @@ -httpClient = new HttpMethodsClient( - HttpClientDiscovery::find(), - MessageFactoryDiscovery::find() - ); - } - - protected function configure() - { - $this - ->setName('ibexa:behat:get-pull-request-data') - ->setAliases(['ezplatform:tools:get-pull-request-data']) - ->setDescription('Get data about a GitHub Pull Request') - ->addArgument( - 'pull-request-url', - InputArgument::REQUIRED, - 'GitHub Pull Request URL' - ) - ->addArgument( - 'token', - InputArgument::OPTIONAL, - 'GitHub OAuth token' - ) - ->setHelp("This command outputs data in given order: - - repository URL - - name of the branch used in PR - - branch alias for the PR - - repository name - - corresponding metarepository branch to run tests on - - corresponding Page Builder branch to run tests on -Command accepts two parameters: GitHub Pull request link and GitHub OATH Token. -If you have configured Composer with your token it can be obtained by running 'composer config github-oauth.github.com --global'") - ->addUsage('https://github.com/ezsystems/ezplatform-admin-ui/pull/1250 ff34885a8624460a855540c6592698d2f1812843'); - } - - public function execute(InputInterface $input, OutputInterface $output) - { - $pullRequestUrl = $input->getArgument('pull-request-url'); - $this->token = $input->getArgument('token'); - - $prUrlData = $this->getPullRequestDataFromURL($pullRequestUrl); - - $responseBody = $this->getPullRequestData($prUrlData['owner'], $prUrlData['repository'], $prUrlData['prNumber'])->getBody(); - - $responseData = json_decode($responseBody->getContents(), true); - $targetBranch = $responseData['base']['ref']; - $branchName = $responseData['head']['ref']; - $repositoryURL = $responseData['head']['repo']['html_url']; - - $composerExtraData = $this->getComposerExtraData($prUrlData['owner'], $prUrlData['repository'], $targetBranch); - $metarepositoryBranch = $composerExtraData['metarepositoryTargetBranch']; - $branchAlias = $composerExtraData['branchAlias']; - $pageBuilderBranch = $this->getPageBuilderBranchName($metarepositoryBranch); - - $outputString = sprintf( - '%s %s %s %s %s %s', - $repositoryURL, - $branchName, - $branchAlias, - $prUrlData['repository'], - $metarepositoryBranch ?: self::UNDEFINED_VALUE, - $pageBuilderBranch ?: self::UNDEFINED_VALUE - ); - - $output->write($outputString); - - return 0; - } - - private function getPullRequestData(string $owner, string $repository, string $prNumber): ResponseInterface - { - $requestUrl = sprintf('https://api.github.com/repos/%s/%s/pulls/%s', $owner, $repository, $prNumber); - - return $this->sendRequest($requestUrl, 'application/vnd.github.v3+json'); - } - - private function getComposerExtraData(string $owner, string $repository, string $branchName): array - { - $requestUrl = sprintf( - 'https://api.github.com/repos/%s/%s/contents/composer.json?ref=%s', - $owner, - $repository, - $branchName - ); - - $composerJsonFile = $this->sendRequest($requestUrl, 'application/vnd.github.v3.raw'); - $data = json_decode($composerJsonFile->getBody()->getContents(), true); - - $branchAlias = $data['extra']['branch-alias']['dev-master']; - $metarepositoryTargetBranch = array_key_exists('_ezplatform_branch_for_behat_tests', $data['extra']) - ? $data['extra']['_ezplatform_branch_for_behat_tests'] - : ''; - - return [ - 'branchAlias' => $branchAlias, - 'metarepositoryTargetBranch' => $metarepositoryTargetBranch, - ]; - } - - private function getPullRequestDataFromURL(string $pullRequestLink): array - { - $matches = []; - preg_match('/.*github.com\/(.*)\/(.*)\/pull\/(.*)/', $pullRequestLink, $matches); - list(, $owner, $repository, $prNumber) = $matches; - - return [ - 'owner' => $owner, - 'repository' => $repository, - 'prNumber' => $prNumber, - ]; - } - - private function getPageBuilderBranchName(string $metarepositoryTargetBranch): string - { - $pageBuilderTargetBranches = [ - '2.5' => '1.3', - '3.0' => '2.0', - '3.1' => '2.1', - '3.2' => '2.2', - 'master' => 'master', - ]; - - if ($metarepositoryTargetBranch === '') { - return ''; - } - - if (!array_key_exists($metarepositoryTargetBranch, $pageBuilderTargetBranches)) { - throw new \Exception(sprintf('Cannot find suitable PageBuilder branch for %s metarepository branch', $metarepositoryTargetBranch)); - } - - return $pageBuilderTargetBranches[$metarepositoryTargetBranch]; - } - - private function sendRequest(string $requestUrl, string $acceptFormat): ResponseInterface - { - $headers = [ - 'User-Agent' => 'ezrobot', - 'Accept' => $acceptFormat, - ]; - - if ($this->token) { - $headers['Authorization'] = sprintf('token %s', $this->token); - } - - $request = new Request('GET', $requestUrl, $headers); - $response = $this->httpClient->sendRequest($request); - - if ($response->getStatusCode() !== 200) { - throw new \Exception( - sprintf( - 'GitHub API returned code %d, expected 200. Reason: %s', - $response->getStatusCode(), - $response->getReasonPhrase() - ) - ); - } - - return $response; - } - - /** - * @return string[] - */ - public function getDeprecatedAliases(): array - { - return ['ezplatform:tools:get-pull-request-data']; - } -} - -class_alias(GetPullRequestDataCommand::class, 'EzSystems\BehatBundle\Command\GetPullRequestDataCommand'); diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php index 25ed1573..df475693 100644 --- a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php +++ b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php @@ -19,7 +19,7 @@ class FieldTypeDataProviderPass implements CompilerPassInterface public function process(ContainerBuilder $container) { $contentDataDefinition = $container->findDefinition(ContentDataProvider::class); - $strategyServiceIds = array_keys($container->findTaggedServiceIds(FieldTypeDataProviderInterface::SERVICE_TAG)); + $strategyServiceIds = array_keys($container->findTaggedServiceIds('ezplatform.behat.fieldtype_data_provider')); foreach ($strategyServiceIds as $strategyServiceId) { $contentDataDefinition->addMethodCall( diff --git a/src/bundle/DependencyInjection/IbexaBehatExtension.php b/src/bundle/DependencyInjection/IbexaBehatExtension.php index 8e16dae2..e3992be2 100644 --- a/src/bundle/DependencyInjection/IbexaBehatExtension.php +++ b/src/bundle/DependencyInjection/IbexaBehatExtension.php @@ -16,6 +16,8 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\DependencyInjection\Loader; +use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; +use Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface; use Symfony\Component\HttpKernel\DependencyInjection\Extension; class IbexaBehatExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface @@ -62,13 +64,19 @@ public function load(array $config, ContainerBuilder $container) $container->registerForAutoconfiguration(PagePreviewInterface::class) ->addTag('ibexa.testing.browser.page_preview'); + + $container->registerForAutoconfiguration(FieldTypeDataProviderInterface::class) + ->addTag('ezplatform.behat.fieldtype_data_provider'); + + $container->registerForAutoconfiguration(LimitationParserInterface::class) + ->addTag('ezplatform.behat.limitation_parser'); } private function shouldLoadDxpServices(ContainerBuilder $container) { $bundles = $container->getParameter('kernel.bundles'); - return isset($bundles['EzPlatformPageBuilderBundle'], $bundles['EzPlatformWorkflowBundle']); + return isset($bundles['IbexaPageBuilderBundle'], $bundles['IbexaWorkflowBundle']); } } diff --git a/src/bundle/IbexaBehatBundle.php b/src/bundle/IbexaBehatBundle.php index 5d329240..75e58315 100644 --- a/src/bundle/IbexaBehatBundle.php +++ b/src/bundle/IbexaBehatBundle.php @@ -16,8 +16,6 @@ class IbexaBehatBundle extends Bundle { - protected $name = 'eZBehatBundle'; - public function build(ContainerBuilder $container) { $container->addCompilerPass(new FieldTypeDataProviderPass()); diff --git a/src/bundle/IbexaExtension.php b/src/bundle/IbexaExtension.php index ef14050e..5e0d7032 100644 --- a/src/bundle/IbexaExtension.php +++ b/src/bundle/IbexaExtension.php @@ -24,17 +24,17 @@ class IbexaExtension implements Extension { - private const MINK_BASE_URL_PARAMETER = 'ibexa.platform.behat.mink.base_url'; + private const MINK_BASE_URL_PARAMETER = 'ibexa.behat.mink.base_url'; - private const MINK_DEFAULT_JAVASCRIPT_SESSION_PARAMETER = 'ibexa.platform.behat.mink.default_javascript_session'; + private const MINK_DEFAULT_JAVASCRIPT_SESSION_PARAMETER = 'ibexa.behat.mink.default_javascript_session'; - private const MINK_SELENIUM_WEBDRIVER_HOST = 'ibexa.platform.behat.mink.selenium.webdriver_host'; + private const MINK_SELENIUM_WEBDRIVER_HOST = 'ibexa.behat.mink.selenium.webdriver_host'; - private const MINK_CHROME_API_URL = 'ibexa.platform.behat.mink.chrome.api_url'; + private const MINK_CHROME_API_URL = 'ibexa.behat.mink.chrome.api_url'; public function getConfigKey() { - return 'ezbehatextension'; + return 'ibexabehatextension'; } public function process(ContainerBuilder $container) diff --git a/src/bundle/Initializer/BehatSiteAccessInitializer.php b/src/bundle/Initializer/BehatSiteAccessInitializer.php index 1d45f29a..4d9e2871 100644 --- a/src/bundle/Initializer/BehatSiteAccessInitializer.php +++ b/src/bundle/Initializer/BehatSiteAccessInitializer.php @@ -18,7 +18,7 @@ final class BehatSiteAccessInitializer implements EventSubscriberInterface { - private const EZPLATFORM_SITEACCESS_ENV_VAR = 'EZPLATFORM_SITEACCESS'; + private const SITEACCESS_ENV_VAR = 'IBEXA_SITEACCESS'; private const DEFAULT_SITEACCESS_PARAMETER = 'ibexa.site_access.default'; private const EVENT_DISPATCHER_SERVICE_ID = 'event_dispatcher'; @@ -51,7 +51,7 @@ public function setSiteAccess(): void private function getSiteAccess(): SiteAccess { - $siteAccessFromEnvVar = getenv(self::EZPLATFORM_SITEACCESS_ENV_VAR); + $siteAccessFromEnvVar = getenv(self::SITEACCESS_ENV_VAR); $defaultSiteAccess = $this->kernel->getContainer()->getParameter(self::DEFAULT_SITEACCESS_PARAMETER); $siteAccessName = $siteAccessFromEnvVar !== false ? $siteAccessFromEnvVar : $defaultSiteAccess; diff --git a/src/bundle/Resources/config/routing.yaml b/src/bundle/Resources/config/routing.yaml index dcd7e6b6..e5f60966 100644 --- a/src/bundle/Resources/config/routing.yaml +++ b/src/bundle/Resources/config/routing.yaml @@ -1,7 +1,7 @@ ez_platform_behat_repository_unauthorized_exception: path: '/platform-behat/exceptions/repository-unauthorized' defaults: - _controller: 'ezbehatbundle.controller.exception:throwRepositoryUnauthorizedAction' + _controller: 'Ibexa\Bundle\Behat\Controller\ExceptionController::throwRepositoryUnauthorizedAction' ibexa_testing_current_user_data: path: '/current_user_data' diff --git a/src/bundle/Resources/config/services.yaml b/src/bundle/Resources/config/services.yaml index ae766429..6c3735d3 100644 --- a/src/bundle/Resources/config/services.yaml +++ b/src/bundle/Resources/config/services.yaml @@ -63,10 +63,6 @@ services: tags: - { name: console.command } - Ibexa\Bundle\Behat\Command\GetPullRequestDataCommand: - tags: - - { name: console.command } - Ibexa\Bundle\Behat\Templating\Twig\PHPTypeExtension: tags: - { name: twig.extension } diff --git a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml index 73ee706f..c2babd81 100644 --- a/src/bundle/Resources/config/services/fieldtype_data_providers.yaml +++ b/src/bundle/Resources/config/services/fieldtype_data_providers.yaml @@ -4,10 +4,6 @@ services: autoconfigure: true public: false - _instanceof: - Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface: - tags: ['ezplatform.behat.fieldtype_data_provider'] - Ibexa\Behat\API\ContentData\FieldTypeData\RandomDataGenerator: ~ Ibexa\Behat\API\ContentData\FieldTypeData\ObjectRelationDataProvider: diff --git a/src/bundle/Resources/config/services/limitation_parsers.yaml b/src/bundle/Resources/config/services/limitation_parsers.yaml index 004efaf2..a9a91cf7 100644 --- a/src/bundle/Resources/config/services/limitation_parsers.yaml +++ b/src/bundle/Resources/config/services/limitation_parsers.yaml @@ -3,10 +3,6 @@ services: autowire: true autoconfigure: true public: false - - _instanceof: - Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface: - tags: ['ezplatform.behat.limitation_parser'] Ibexa\Behat\API\Context\LimitationParser\ContentTypeLimitationParser: arguments: diff --git a/src/bundle/Resources/encore/ez.config.manager.js b/src/bundle/Resources/encore/ez.config.manager.js index 23c1ebec..f5369c6d 100644 --- a/src/bundle/Resources/encore/ez.config.manager.js +++ b/src/bundle/Resources/encore/ez.config.manager.js @@ -1,10 +1,10 @@ const path = require('path'); -module.exports = (eZConfig, eZConfigManager) => { +module.exports = (ibexaConfig, ibexaConfigManager) => { const addEntry = ([entryName, newItems]) => { - if (eZConfig.entry[entryName]) { - eZConfigManager.add({ - eZConfig, + if (ibexaConfig.entry[entryName]) { + ibexaConfigManager.add({ + ibexaConfig, entryName, newItems, }); diff --git a/src/bundle/Resources/views/tests/cache/embed_esi.html.twig b/src/bundle/Resources/views/tests/cache/embed_esi.html.twig index 84d382eb..9c2ca7f1 100644 --- a/src/bundle/Resources/views/tests/cache/embed_esi.html.twig +++ b/src/bundle/Resources/views/tests/cache/embed_esi.html.twig @@ -1,3 +1,3 @@ -{{ ez_render(content) }} +{{ ibexa_render(content) }} -{{ ez_render(embeddedItem, {'viewType': 'line', 'method': 'esi'}) }} +{{ ibexa_render(embeddedItem, {'viewType': 'line', 'method': 'esi'}) }} diff --git a/src/bundle/Resources/views/tests/cache/embed_no_esi.html.twig b/src/bundle/Resources/views/tests/cache/embed_no_esi.html.twig index 4ae126fd..3296f1d8 100644 --- a/src/bundle/Resources/views/tests/cache/embed_no_esi.html.twig +++ b/src/bundle/Resources/views/tests/cache/embed_no_esi.html.twig @@ -1,3 +1,3 @@ -{{ ez_render(content) }} +{{ ibexa_render(content) }} -{{ ez_render(embeddedItem, {'viewType': 'line'}) }} +{{ ibexa_render(embeddedItem, {'viewType': 'line'}) }} diff --git a/src/bundle/Resources/views/tests/cache/embedded.html.twig b/src/bundle/Resources/views/tests/cache/embedded.html.twig index f10968b3..c8758a21 100644 --- a/src/bundle/Resources/views/tests/cache/embedded.html.twig +++ b/src/bundle/Resources/views/tests/cache/embedded.html.twig @@ -1 +1 @@ -{{ ez_render(content) }} +{{ ibexa_render(content) }} diff --git a/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php b/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php index 84891485..0b93b240 100644 --- a/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php +++ b/src/lib/API/ContentData/FieldTypeData/FieldTypeDataProviderInterface.php @@ -10,8 +10,6 @@ interface FieldTypeDataProviderInterface { - public const SERVICE_TAG = 'ezplatform.behat.fieldtype_data_provider'; - public function supports(string $fieldTypeIdentifier): bool; public function generateData(string $contentTypeIdentifier, string $fieldIdentifier, string $language = 'eng-GB'); diff --git a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php index 02d0f3e8..e09c1e6a 100644 --- a/src/lib/API/Context/LimitationParser/LimitationParserInterface.php +++ b/src/lib/API/Context/LimitationParser/LimitationParserInterface.php @@ -12,8 +12,6 @@ interface LimitationParserInterface { - public const SERVICE_TAG = 'ezplatform.behat.limitation_parser'; - public function supports(string $limitationType): bool; public function parse(string $limitationValues): Limitation; diff --git a/src/lib/Core/Context/FileContext.php b/src/lib/Core/Context/FileContext.php index 25b77375..7a332be0 100644 --- a/src/lib/Core/Context/FileContext.php +++ b/src/lib/Core/Context/FileContext.php @@ -15,7 +15,7 @@ class FileContext implements Context { - private const SOURCE_FILE_DIRECTORY = 'vendor/ezsystems/behatbundle/src/lib/Data'; + private const SOURCE_FILE_DIRECTORY = 'vendor/ibexa/behat/src/lib/Data'; /** @var string */ private $projectDirectory; diff --git a/src/lib/Core/Log/TestLogProvider.php b/src/lib/Core/Log/TestLogProvider.php index 3eeee1f6..673ca398 100644 --- a/src/lib/Core/Log/TestLogProvider.php +++ b/src/lib/Core/Log/TestLogProvider.php @@ -17,7 +17,6 @@ class TestLogProvider { private const CONSOLE_LOGS_LIMIT = 10; private const APPLICATION_LOGS_LIMIT = 25; - private const OLD_LOG_FILE_NAME = 'travis_test.log'; private const LOG_FILE_NAME = 'behat.log'; private static $LOGS; diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig index 6a94beee..5228d316 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout1.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig index 0f3d0090..bae68b03 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout10.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig index 9735ece4..80d95165 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout11.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig index 8da6f893..8ebdc89a 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout12.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig index 74baad58..686d81f7 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout13.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig index bb052d74..f021e30e 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout14.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig index 4fef77e4..a71e48dd 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout15.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig index 328d2926..fc7d13d6 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout16.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig index 86cab435..e5f5d7cf 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout17.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig index d36e9f3d..433f73e1 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout18.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig index 8ca0d3cd..ec1e0ded 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout19.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig index 7505bbec..b717aabf 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout2.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig index 0812ea6b..5825c554 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout20.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig index 7f5cd46c..bcf6f917 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout3.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig index ebdad082..d13d37dc 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout4.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig index a61af14b..6f86bbff 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout5.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig index 91b1e5f3..0efeddbf 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout6.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig index 03e9aecb..baa1e094 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout7.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig index 6de48be8..be9e7953 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout8.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
diff --git a/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig b/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig index 22ad874e..1f037e96 100644 --- a/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig +++ b/src/lib/Data/Templates/SiteFactory/pagelayout9.html.twig @@ -18,17 +18,17 @@
Item: -{{ ez_render(content) }} +{{ ibexa_render(content) }}
Item with ESI: -{{ ez_render(content, { method: "esi" }) }} +{{ ibexa_render(content, { method: "esi" }) }}
Site: -{{ ez_render(ezplatform.rootLocation)}} +{{ ibexa_render(ezplatform.rootLocation)}}
From 243d34e351667df2e0aaa365db4a8a21e26f2721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 16 Feb 2022 14:19:20 +0100 Subject: [PATCH 34/85] Another cross-rebranding --- .../Controller/UnauthenticatedRedirectController.php | 2 +- .../Compiler/ElementFactoryCompilerPass.php | 6 +++--- .../Compiler/FieldTypeDataProviderPass.php | 2 +- .../Compiler/LimitationParserPass.php | 2 +- src/bundle/DependencyInjection/IbexaBehatExtension.php | 10 +++++----- src/bundle/Resources/config/routing.yaml | 4 ++-- src/bundle/Resources/config/services/pages.yaml | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bundle/Controller/UnauthenticatedRedirectController.php b/src/bundle/Controller/UnauthenticatedRedirectController.php index 8c3e6b19..c851271b 100644 --- a/src/bundle/Controller/UnauthenticatedRedirectController.php +++ b/src/bundle/Controller/UnauthenticatedRedirectController.php @@ -19,6 +19,6 @@ public function performAccessCheck() public function redirectAction() { - return $this->redirectToRoute('ibexa_testing_current_user_data'); + return $this->redirectToRoute('ibexa.behat.current_user_data'); } } diff --git a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php index 4e755feb..b53559b1 100644 --- a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php +++ b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php @@ -23,7 +23,7 @@ public function process(ContainerBuilder $container) $interactiveDebugElementFactory = $container->findDefinition(ElementFactory::class); - $componentServiceIds = array_keys($container->findTaggedServiceIds('ibexa.testing.browser.component')); + $componentServiceIds = array_keys($container->findTaggedServiceIds('ibexa.behat.browser.component')); foreach ($componentServiceIds as $componentServiceId) { $compontentDefinition = $container->findDefinition($componentServiceId); $compontentDefinition->addMethodCall('setElementFactory', [$interactiveDebugElementFactory]); @@ -32,8 +32,8 @@ public function process(ContainerBuilder $container) private function shouldEnableInteractiveDebug(ContainerBuilder $container): bool { - return $container->hasParameter(eZBehatExtension::BROWSER_DEBUG_INTERACTIVE_ENABLED) && - $container->getParameter(eZBehatExtension::BROWSER_DEBUG_INTERACTIVE_ENABLED); + return $container->hasParameter(IbexaBehatExtension::BROWSER_DEBUG_INTERACTIVE_ENABLED) && + $container->getParameter(IbexaBehatExtension::BROWSER_DEBUG_INTERACTIVE_ENABLED); } } diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php index df475693..23b1f5e1 100644 --- a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php +++ b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php @@ -19,7 +19,7 @@ class FieldTypeDataProviderPass implements CompilerPassInterface public function process(ContainerBuilder $container) { $contentDataDefinition = $container->findDefinition(ContentDataProvider::class); - $strategyServiceIds = array_keys($container->findTaggedServiceIds('ezplatform.behat.fieldtype_data_provider')); + $strategyServiceIds = array_keys($container->findTaggedServiceIds('ibexa.behat.fieldtype_data_provider')); foreach ($strategyServiceIds as $strategyServiceId) { $contentDataDefinition->addMethodCall( diff --git a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php index d4de9e61..bcf6d169 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php @@ -19,7 +19,7 @@ class LimitationParserPass implements CompilerPassInterface public function process(ContainerBuilder $container) { $parserCollector = $container->findDefinition(LimitationParsersCollector::class); - $strategyServiceIds = array_keys($container->findTaggedServiceIds(LimitationParserInterface::SERVICE_TAG)); + $strategyServiceIds = array_keys($container->findTaggedServiceIds('ibexa.behat.fieldtype_data_provider')); foreach ($strategyServiceIds as $strategyServiceId) { $parserCollector->addMethodCall( diff --git a/src/bundle/DependencyInjection/IbexaBehatExtension.php b/src/bundle/DependencyInjection/IbexaBehatExtension.php index e3992be2..513c4586 100644 --- a/src/bundle/DependencyInjection/IbexaBehatExtension.php +++ b/src/bundle/DependencyInjection/IbexaBehatExtension.php @@ -57,19 +57,19 @@ public function load(array $config, ContainerBuilder $container) } $container->registerForAutoconfiguration(Component::class) - ->addTag('ibexa.testing.browser.component'); + ->addTag('ibexa.behat.browser.component'); $container->registerForAutoconfiguration(PageInterface::class) - ->addTag('ibexa.testing.browser.page'); + ->addTag('ibexa.behat.browser.page'); $container->registerForAutoconfiguration(PagePreviewInterface::class) - ->addTag('ibexa.testing.browser.page_preview'); + ->addTag('ibexa.behat.browser.page_preview'); $container->registerForAutoconfiguration(FieldTypeDataProviderInterface::class) - ->addTag('ezplatform.behat.fieldtype_data_provider'); + ->addTag('ibexa.behat.fieldtype_data_provider'); $container->registerForAutoconfiguration(LimitationParserInterface::class) - ->addTag('ezplatform.behat.limitation_parser'); + ->addTag('ibexa.behat.limitation_parser'); } private function shouldLoadDxpServices(ContainerBuilder $container) diff --git a/src/bundle/Resources/config/routing.yaml b/src/bundle/Resources/config/routing.yaml index e5f60966..1d07c7df 100644 --- a/src/bundle/Resources/config/routing.yaml +++ b/src/bundle/Resources/config/routing.yaml @@ -1,9 +1,9 @@ -ez_platform_behat_repository_unauthorized_exception: +ibexa.behat.repository_unauthorized_exception: path: '/platform-behat/exceptions/repository-unauthorized' defaults: _controller: 'Ibexa\Bundle\Behat\Controller\ExceptionController::throwRepositoryUnauthorizedAction' -ibexa_testing_current_user_data: +ibexa.behat.current_user_data: path: '/current_user_data' defaults: _controller: 'Ibexa\Bundle\Behat\Controller\CurrentUserDataController::showCurrentUserAction' diff --git a/src/bundle/Resources/config/services/pages.yaml b/src/bundle/Resources/config/services/pages.yaml index ca321f70..01af82d2 100644 --- a/src/bundle/Resources/config/services/pages.yaml +++ b/src/bundle/Resources/config/services/pages.yaml @@ -10,10 +10,10 @@ services: Ibexa\Behat\Browser\Page\PageRegistry: arguments: - - !tagged_iterator ibexa.testing.browser.page + - !tagged_iterator ibexa.behat.browser.page Ibexa\Behat\Browser\Page\Preview\PagePreviewRegistry: arguments: - - !tagged_iterator ibexa.testing.browser.page_preview + - !tagged_iterator ibexa.behat.browser.page_preview Ibexa\Behat\Browser\Page\Preview\FolderPreview: ~ From e6a651a9ae8d243ff74b53658436beca383f9817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 24 Feb 2022 16:46:36 +0100 Subject: [PATCH 35/85] Manual fixes --- src/bundle/Controller/CurrentUserDataController.php | 2 +- .../DependencyInjection/Compiler/LimitationParserPass.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bundle/Controller/CurrentUserDataController.php b/src/bundle/Controller/CurrentUserDataController.php index 2131bd67..72878716 100644 --- a/src/bundle/Controller/CurrentUserDataController.php +++ b/src/bundle/Controller/CurrentUserDataController.php @@ -40,7 +40,7 @@ public function showCurrentUserAction(Request $request): Response $userName = $this->userService->loadUser($currentUserId)->getName(); return $this->render( - '@eZBehat/tests/login_data.html.twig', + '@IbexaBehat/tests/login_data.html.twig', [ 'username' => $userName, 'siteaccess' => $siteaccess->name, diff --git a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php index bcf6d169..7bcfdd9e 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php @@ -19,7 +19,7 @@ class LimitationParserPass implements CompilerPassInterface public function process(ContainerBuilder $container) { $parserCollector = $container->findDefinition(LimitationParsersCollector::class); - $strategyServiceIds = array_keys($container->findTaggedServiceIds('ibexa.behat.fieldtype_data_provider')); + $strategyServiceIds = array_keys($container->findTaggedServiceIds('ibexa.behat.limitation_parser')); foreach ($strategyServiceIds as $strategyServiceId) { $parserCollector->addMethodCall( From 63125534cca55b51d6c51736bd3570bfb5a7386e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 24 Feb 2022 17:24:10 +0100 Subject: [PATCH 36/85] Parameter rebranding --- src/bundle/DependencyInjection/IbexaBehatExtension.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bundle/DependencyInjection/IbexaBehatExtension.php b/src/bundle/DependencyInjection/IbexaBehatExtension.php index 513c4586..071f4f60 100644 --- a/src/bundle/DependencyInjection/IbexaBehatExtension.php +++ b/src/bundle/DependencyInjection/IbexaBehatExtension.php @@ -22,11 +22,11 @@ class IbexaBehatExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface { - private const OVERRIDE_CONFIGURATION = 'ibexa.testing.override_configuration'; + private const OVERRIDE_CONFIGURATION = 'ibexa.behat.override_configuration'; - private const BROWSER_TESTING_ENABLED = 'ibexa.testing.browser.enabled'; + private const BROWSER_TESTING_ENABLED = 'ibexa.behat.browser.enabled'; - public const BROWSER_DEBUG_INTERACTIVE_ENABLED = 'ibexa.testing.behat.browser.debug.interactive.enabled'; + public const BROWSER_DEBUG_INTERACTIVE_ENABLED = 'ibexa.behat.browser.debug.interactive.enabled'; public function process(ContainerBuilder $container) { From 3a12dbad13d601d9a23a9235e4e38c00e0af05bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 25 Feb 2022 15:42:01 +0100 Subject: [PATCH 37/85] Fixed CS --- .../Compiler/ElementFactoryCompilerPass.php | 2 +- .../Compiler/FieldTypeDataProviderPass.php | 1 - .../DependencyInjection/Compiler/LimitationParserPass.php | 1 - src/bundle/DependencyInjection/IbexaBehatExtension.php | 4 ++-- src/bundle/IbexaExtension.php | 2 +- .../FieldTypeData/AbstractFieldTypeDataProvider.php | 2 +- src/lib/API/Facade/ContentFacade.php | 2 +- src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php | 2 +- src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php | 2 +- src/lib/Browser/Element/Debug/Interactive/BaseElement.php | 2 +- src/lib/Browser/Element/Debug/Interactive/Element.php | 2 +- .../Browser/Element/Debug/Interactive/ElementCollection.php | 2 +- src/lib/Browser/Element/Debug/Interactive/RootElement.php | 2 +- src/lib/Core/Debug/InteractiveDebuggerTrait.php | 2 +- .../Browser/Element/Condition/ElementExistsConditionTest.php | 2 +- .../Element/Condition/ElementNotExistsConditionTest.php | 2 +- .../Condition/ElementTransitionHasEndedConditionTest.php | 2 +- .../Browser/Element/Condition/ElementsCountConditionTest.php | 2 +- .../Condition/ElementsCountGreaterThanConditionTest.php | 2 +- .../Element/Criterion/ChildElementTextCriterionTest.php | 2 +- .../Element/Criterion/ElementAttributeCriterionTest.php | 2 +- .../Browser/Element/Criterion/ElementTextCriterionTest.php | 2 +- .../Element/Criterion/ElementTextFragmentCriterionTest.php | 2 +- .../lib/Browser/Element/Criterion/LogicalOrCriterionTest.php | 2 +- tests/lib/Browser/Element/Mapper/TextMapperTestCase.php | 2 +- tests/lib/Core/Behat/ArgumentParserTest.php | 2 +- 26 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php index b53559b1..6498f47e 100644 --- a/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php +++ b/src/bundle/DependencyInjection/Compiler/ElementFactoryCompilerPass.php @@ -8,8 +8,8 @@ namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; -use Ibexa\Bundle\Behat\DependencyInjection\IbexaBehatExtension; use Ibexa\Behat\Browser\Element\Factory\Debug\Interactive\ElementFactory; +use Ibexa\Bundle\Behat\DependencyInjection\IbexaBehatExtension; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php index 23b1f5e1..9034ef75 100644 --- a/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php +++ b/src/bundle/DependencyInjection/Compiler/FieldTypeDataProviderPass.php @@ -9,7 +9,6 @@ namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; use Ibexa\Behat\API\ContentData\ContentDataProvider; -use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; diff --git a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php index 7bcfdd9e..96d978a6 100644 --- a/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php +++ b/src/bundle/DependencyInjection/Compiler/LimitationParserPass.php @@ -8,7 +8,6 @@ namespace Ibexa\Bundle\Behat\DependencyInjection\Compiler; -use Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface; use Ibexa\Behat\API\Context\LimitationParser\LimitationParsersCollector; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/bundle/DependencyInjection/IbexaBehatExtension.php b/src/bundle/DependencyInjection/IbexaBehatExtension.php index 071f4f60..05215464 100644 --- a/src/bundle/DependencyInjection/IbexaBehatExtension.php +++ b/src/bundle/DependencyInjection/IbexaBehatExtension.php @@ -8,6 +8,8 @@ namespace Ibexa\Bundle\Behat\DependencyInjection; +use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; +use Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface; use Ibexa\Behat\Browser\Component\Component; use Ibexa\Behat\Browser\Page\PageInterface; use Ibexa\Behat\Browser\Page\Preview\PagePreviewInterface; @@ -16,8 +18,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\DependencyInjection\Loader; -use Ibexa\Behat\API\ContentData\FieldTypeData\FieldTypeDataProviderInterface; -use Ibexa\Behat\API\Context\LimitationParser\LimitationParserInterface; use Symfony\Component\HttpKernel\DependencyInjection\Extension; class IbexaBehatExtension extends Extension implements PrependExtensionInterface, CompilerPassInterface diff --git a/src/bundle/IbexaExtension.php b/src/bundle/IbexaExtension.php index 5e0d7032..fd9b5f05 100644 --- a/src/bundle/IbexaExtension.php +++ b/src/bundle/IbexaExtension.php @@ -13,8 +13,8 @@ use Behat\Testwork\ServiceContainer\Extension; use Behat\Testwork\ServiceContainer\ExtensionManager; use DMore\ChromeDriver\ChromeDriver; -use Ibexa\Bundle\Behat\Initializer\BehatSiteAccessInitializer; use FriendsOfBehat\SymfonyExtension\ServiceContainer\SymfonyExtension; +use Ibexa\Bundle\Behat\Initializer\BehatSiteAccessInitializer; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php b/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php index 8d09b0cc..d86f854c 100644 --- a/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/AbstractFieldTypeDataProvider.php @@ -8,8 +8,8 @@ namespace Ibexa\Behat\API\ContentData\FieldTypeData; -use Ibexa\Behat\API\ContentData\RandomDataGenerator; use Faker\Generator; +use Ibexa\Behat\API\ContentData\RandomDataGenerator; abstract class AbstractFieldTypeDataProvider implements FieldTypeDataProviderInterface { diff --git a/src/lib/API/Facade/ContentFacade.php b/src/lib/API/Facade/ContentFacade.php index b3daa4a5..35cd1db1 100644 --- a/src/lib/API/Facade/ContentFacade.php +++ b/src/lib/API/Facade/ContentFacade.php @@ -8,8 +8,8 @@ namespace Ibexa\Behat\API\Facade; -use Ibexa\Behat\API\ContentData\ContentDataProvider; use FOS\HttpCacheBundle\CacheManager; +use Ibexa\Behat\API\ContentData\ContentDataProvider; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\Repository; diff --git a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php index cf2c1d3c..5ecf94bf 100644 --- a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php +++ b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php @@ -8,9 +8,9 @@ namespace Ibexa\Behat\Browser\Assert\Debug\Interactive; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\CollectionAssertInterface; use Ibexa\Behat\Browser\Element\ElementCollectionInterface; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use PHPUnit\Framework\ExpectationFailedException; class CollectionAssert implements CollectionAssertInterface diff --git a/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php b/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php index 65c444f6..17e21214 100644 --- a/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php +++ b/src/lib/Browser/Assert/Debug/Interactive/ElementAssert.php @@ -8,9 +8,9 @@ namespace Ibexa\Behat\Browser\Assert\Debug\Interactive; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; use Ibexa\Behat\Browser\Element\ElementInterface; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use PHPUnit\Framework\ExpectationFailedException; class ElementAssert implements ElementAssertInterface diff --git a/src/lib/Browser/Element/Debug/Interactive/BaseElement.php b/src/lib/Browser/Element/Debug/Interactive/BaseElement.php index 31e9ae36..1cea0037 100644 --- a/src/lib/Browser/Element/Debug/Interactive/BaseElement.php +++ b/src/lib/Browser/Element/Debug/Interactive/BaseElement.php @@ -8,13 +8,13 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Element\BaseElementInterface; use Ibexa\Behat\Browser\Element\Condition\ConditionInterface; use Ibexa\Behat\Browser\Element\ElementCollectionInterface; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Exception\TimeoutException; use Ibexa\Behat\Browser\Locator\LocatorInterface; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; class BaseElement implements BaseElementInterface { diff --git a/src/lib/Browser/Element/Debug/Interactive/Element.php b/src/lib/Browser/Element/Debug/Interactive/Element.php index ff1d6ce6..43ff1f4d 100644 --- a/src/lib/Browser/Element/Debug/Interactive/Element.php +++ b/src/lib/Browser/Element/Debug/Interactive/Element.php @@ -9,10 +9,10 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; use Exception; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\Debug\Interactive\ElementAssert as InteractiveElementAssert; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; use Ibexa\Behat\Browser\Element\ElementInterface; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; final class Element extends BaseElement implements ElementInterface { diff --git a/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php b/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php index 95b60f8d..ed3845a1 100644 --- a/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php +++ b/src/lib/Browser/Element/Debug/Interactive/ElementCollection.php @@ -8,7 +8,6 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Assert\CollectionAssertInterface; use Ibexa\Behat\Browser\Assert\Debug\Interactive\CollectionAssert as InteractiveElementCollectionAssert; use Ibexa\Behat\Browser\Element\Criterion\CriterionInterface; @@ -16,6 +15,7 @@ use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Element\Mapper\MapperInterface; use Ibexa\Behat\Browser\Exception\ElementNotFoundException; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use PHPUnit\Framework\ExpectationFailedException; use Traversable; diff --git a/src/lib/Browser/Element/Debug/Interactive/RootElement.php b/src/lib/Browser/Element/Debug/Interactive/RootElement.php index 74357f5b..30dd2aab 100644 --- a/src/lib/Browser/Element/Debug/Interactive/RootElement.php +++ b/src/lib/Browser/Element/Debug/Interactive/RootElement.php @@ -9,8 +9,8 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; use Exception; -use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; use Ibexa\Behat\Browser\Element\RootElementInterface; +use Ibexa\Behat\Core\Debug\InteractiveDebuggerTrait; final class RootElement extends BaseElement implements RootElementInterface { diff --git a/src/lib/Core/Debug/InteractiveDebuggerTrait.php b/src/lib/Core/Debug/InteractiveDebuggerTrait.php index d78e73f5..0991f044 100644 --- a/src/lib/Core/Debug/InteractiveDebuggerTrait.php +++ b/src/lib/Core/Debug/InteractiveDebuggerTrait.php @@ -9,13 +9,13 @@ namespace Ibexa\Behat\Core\Debug; use Exception; +use Ibexa\Behat\Browser\Component\Component; use Ibexa\Behat\Core\Debug\Command\GoBackCommand; use Ibexa\Behat\Core\Debug\Command\RefreshPageCommand; use Ibexa\Behat\Core\Debug\Command\ShowHTMLCommand; use Ibexa\Behat\Core\Debug\Command\ShowURLCommand; use Ibexa\Behat\Core\Debug\Command\TakeScreenshotCommand; use Ibexa\Behat\Core\Debug\Shell\Shell; -use Ibexa\Behat\Browser\Component\Component; use RuntimeException; trait InteractiveDebuggerTrait diff --git a/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php b/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php index 5f61e2d1..a3136a72 100644 --- a/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementExistsConditionTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementExistsConditionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php b/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php index b26ba0fe..6f87e930 100644 --- a/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementNotExistsConditionTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementNotExistsConditionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php index 0bcb144e..d4645d85 100644 --- a/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementTransitionHasEndedCondition; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementTransitionHasEndedConditionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php b/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php index b897b3f5..74395a06 100644 --- a/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementsCountConditionTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementsCountCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementsCountConditionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php b/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php index 4dd7d341..24dbdf50 100644 --- a/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementsCountGreaterThanConditionTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Behat\Browser\Element\Condition; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Condition\ElementsCountGreaterThanCondition; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementsCountGreaterThanConditionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php b/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php index 1904af39..7e465449 100644 --- a/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ChildElementTextCriterionTest.php @@ -8,11 +8,11 @@ namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ChildElementTextCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; use Ibexa\Behat\Browser\Locator\XPathLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ChildElementTextCriterionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php index 05dd6d39..ca856ec8 100644 --- a/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementAttributeCriterionTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementAttributeCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementAttributeCriterionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php index 07f25165..9c8359e1 100644 --- a/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementTextCriterionTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementTextCriterionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php b/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php index 40f7e0d6..9231a73d 100644 --- a/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/ElementTextFragmentCriterionTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextFragmentCriterion; use Ibexa\Behat\Browser\Element\ElementInterface; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class ElementTextFragmentCriterionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php b/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php index d96eaaea..a12238d2 100644 --- a/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php +++ b/tests/lib/Browser/Element/Criterion/LogicalOrCriterionTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Behat\Browser\Element\Criterion; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion; use Ibexa\Behat\Browser\Element\Criterion\LogicalOrCriterion; use Ibexa\Behat\Browser\Locator\CSSLocator; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class LogicalOrCriterionTest extends BaseTestCase diff --git a/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php b/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php index c613a9c3..37c2966d 100644 --- a/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php +++ b/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Behat\Browser\Element\Mapper; -use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper; +use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; class TextMapperTestCase extends BaseTestCase diff --git a/tests/lib/Core/Behat/ArgumentParserTest.php b/tests/lib/Core/Behat/ArgumentParserTest.php index 9cff2346..e3c0e668 100644 --- a/tests/lib/Core/Behat/ArgumentParserTest.php +++ b/tests/lib/Core/Behat/ArgumentParserTest.php @@ -9,8 +9,8 @@ namespace Ibexa\Tests\Behat\Core\Behat; use Ibexa\Behat\API\Facade\RoleFacade; -use Ibexa\Behat\Core\Behat\ArgumentParser; use Ibexa\Behat\Browser\Environment\ParameterProvider; +use Ibexa\Behat\Core\Behat\ArgumentParser; use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; From b028cd15bcb6f413e19b482dce9b1fa133b92384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 28 Feb 2022 09:33:24 +0100 Subject: [PATCH 38/85] Review fixes --- composer.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 22398edf..87f246ea 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,9 @@ { "name": "ibexa/behat", - "description": "Behat bundle for help testing eZ Bundles and projects", "license": "GPL-2.0", - "authors": [ - { - "name": "eZ Publish dev-team & eZ Community", - "homepage": "https://github.com/ibexa/behat" - } - ], + "replace": { + "ezsystems/behatbundle": "*" + }, "require": { "php": "^7.4 || ^8.0", "ext-json": "*", From 809c88e3e55b61207247440505f94acdd615e6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 3 Mar 2022 09:15:28 +0100 Subject: [PATCH 39/85] Added cross-merge workflow --- .github/workflows/cross-merge.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/cross-merge.yaml diff --git a/.github/workflows/cross-merge.yaml b/.github/workflows/cross-merge.yaml new file mode 100644 index 00000000..41c5df1e --- /dev/null +++ b/.github/workflows/cross-merge.yaml @@ -0,0 +1,12 @@ +name: Ibexa Reusable / Cross Org PR + +on: + push: + branches-ignore: + - "temp_*" + +jobs: + call: + uses: ibexa/gh-workflows/.github/workflows/cross-merge.yml@main + secrets: + robot-token: ${{ secrets.EZROBOT_PAT }} From 5afbbf37efe96ebf786bff4b09b26071a03eb549 Mon Sep 17 00:00:00 2001 From: Ibexa Bot Date: Thu, 10 Mar 2022 15:37:02 +0100 Subject: [PATCH 40/85] Merge branch '8.3' of ezsystems/BehatBundle into main (#4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added cross-merge workflow * [Behat] IBX-1176 (#240) Co-authored-by: Bogdan Mazur Co-authored-by: Marek Nocoń Co-authored-by: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 64e964d4..29d434ea 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -68,6 +68,7 @@ regression: - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\CheckoutContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\FrontContext + - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ManageAddressContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ProductVariantContext - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\UserRegistrationContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext From 3d4dc0d443214ee34476c74e9915cd955a96feca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 22 Mar 2022 12:24:43 +0100 Subject: [PATCH 41/85] Created 4.0 stable branch --- composer.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3f400648..8988ab07 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { "name": "ibexa/behat", + "description": "Ibexa Behat", "license": "GPL-2.0", "replace": { "ezsystems/behatbundle": "*" @@ -16,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "^4.0@dev", - "ibexa/core": "^4.0@dev", + "ibexa/http-cache": "~4.0.0@dev", + "ibexa/core": "~4.0.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -41,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "^4.0@dev", - "ibexa/rest": "^4.0@dev", + "ibexa/doctrine-schema": "~4.0.0@dev", + "ibexa/rest": "~4.0.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { From 386ee9c4d9d91fe4f12a2150cedce6e25815d4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 22 Mar 2022 13:58:07 +0100 Subject: [PATCH 42/85] Set up main to be the future 4.1 branch --- .github/workflows/browser-tests.yaml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index df722913..6d81618f 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.0.x-dev' + project-version: '^4.1.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' secrets: @@ -23,7 +23,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.0.x-dev' + project-version: '^4.1.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/composer.json b/composer.json index 8988ab07..a7533430 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "~4.0.0@dev", - "ibexa/core": "~4.0.0@dev", + "ibexa/http-cache": "~4.1.0@dev", + "ibexa/core": "~4.1.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -42,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "~4.0.0@dev", - "ibexa/rest": "~4.0.0@dev", + "ibexa/doctrine-schema": "~4.1.0@dev", + "ibexa/rest": "~4.1.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { @@ -69,7 +69,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.0.x-dev" + "dev-main": "4.1.x-dev" } }, "bin": ["bin/ibexabehat", "bin/ibexareport"], From a9c3cd72f692a57589cbff1b2e76ce6fcbaf2f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 22 Mar 2022 16:09:42 +0100 Subject: [PATCH 43/85] [Composer/CI] Corrected 4.0.x-dev requirement --- .github/workflows/browser-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index df722913..20f6a6ca 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.0.x-dev' + project-version: '4.0.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' secrets: @@ -23,7 +23,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.0.x-dev' + project-version: '4.0.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From ceed27511a3b9a6a8fa0e053218a4e353f1ff7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 22 Mar 2022 16:32:29 +0100 Subject: [PATCH 44/85] [Composer/CI] Corrected 4.1.x-dev requirement --- .github/workflows/browser-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 6d81618f..ae65696f 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.1.x-dev' + project-version: '4.1.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' secrets: @@ -23,7 +23,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '^4.1.x-dev' + project-version: '4.1.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From 64eb1fdb6ae78cc881d0974a90cbb739854bff17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 11 Apr 2022 12:02:15 +0200 Subject: [PATCH 45/85] Added a way of scrolling to the bottom of an element (#9) --- src/lib/Browser/Element/BaseElement.php | 2 +- .../Browser/Element/Debug/Highlighting/Element.php | 5 +++++ src/lib/Browser/Element/Debug/Interactive/Element.php | 6 ++++++ src/lib/Browser/Element/Element.php | 11 +++++++++++ src/lib/Browser/Element/ElementInterface.php | 3 +++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/lib/Browser/Element/BaseElement.php b/src/lib/Browser/Element/BaseElement.php index e44be167..faf33c83 100644 --- a/src/lib/Browser/Element/BaseElement.php +++ b/src/lib/Browser/Element/BaseElement.php @@ -22,7 +22,7 @@ class BaseElement implements BaseElementInterface /** @var \Behat\Mink\Element\TraversableElement */ protected $decoratedElement; - /** @var \Ibexa\Behat\Browser\Component\ElementFactoryInterface */ + /** @var \Ibexa\Behat\Browser\Element\Factory\ElementFactoryInterface */ private $elementFactory; public function __construct(ElementFactoryInterface $elementFactory) diff --git a/src/lib/Browser/Element/Debug/Highlighting/Element.php b/src/lib/Browser/Element/Debug/Highlighting/Element.php index 8cb2996c..31f82adf 100644 --- a/src/lib/Browser/Element/Debug/Highlighting/Element.php +++ b/src/lib/Browser/Element/Debug/Highlighting/Element.php @@ -100,4 +100,9 @@ public function getXPath(): string { return $this->element->getXPath(); } + + public function scrollToBottom(Session $session): void + { + $this->element->scrollToBottom($session); + } } diff --git a/src/lib/Browser/Element/Debug/Interactive/Element.php b/src/lib/Browser/Element/Debug/Interactive/Element.php index 43ff1f4d..69b41234 100644 --- a/src/lib/Browser/Element/Debug/Interactive/Element.php +++ b/src/lib/Browser/Element/Debug/Interactive/Element.php @@ -8,6 +8,7 @@ namespace Ibexa\Behat\Browser\Element\Debug\Interactive; +use Behat\Mink\Session; use Exception; use Ibexa\Behat\Browser\Assert\Debug\Interactive\ElementAssert as InteractiveElementAssert; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; @@ -106,4 +107,9 @@ public function getXPath(): string { return $this->element->getXPath(); } + + public function scrollToBottom(Session $session): void + { + $this->element->scrollToBottom($session); + } } diff --git a/src/lib/Browser/Element/Element.php b/src/lib/Browser/Element/Element.php index 06871d55..30218d5c 100644 --- a/src/lib/Browser/Element/Element.php +++ b/src/lib/Browser/Element/Element.php @@ -9,6 +9,7 @@ namespace Ibexa\Behat\Browser\Element; use Behat\Mink\Element\NodeElement; +use Behat\Mink\Session; use Ibexa\Behat\Browser\Assert\ElementAssert; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; use Ibexa\Behat\Browser\Element\Factory\ElementFactoryInterface; @@ -127,6 +128,16 @@ public function getXPath(): string return $this->decoratedElement->getXpath(); } + public function scrollToBottom(Session $session): void + { + $script = sprintf( + 'document.querySelector("%1$s").scrollTo(0, document.querySelector("%1$s").scrollHeight)', + $this->locator->getSelector() + ); + + $session->executeScript($script); + } + protected function isCheckbox(): bool { return $this->decoratedElement->hasAttribute('type') && 'checkbox' === $this->decoratedElement->getAttribute('type'); diff --git a/src/lib/Browser/Element/ElementInterface.php b/src/lib/Browser/Element/ElementInterface.php index 6164091b..06bec998 100644 --- a/src/lib/Browser/Element/ElementInterface.php +++ b/src/lib/Browser/Element/ElementInterface.php @@ -8,6 +8,7 @@ namespace Ibexa\Behat\Browser\Element; +use Behat\Mink\Session; use Ibexa\Behat\Browser\Assert\ElementAssertInterface; interface ElementInterface extends BaseElementInterface @@ -43,4 +44,6 @@ public function isValid(): bool; public function selectOption(string $option): void; public function getXPath(): string; + + public function scrollToBottom(Session $session): void; } From 90c1798bb7f2db9ad69cda8c44ec9ff6dc44a8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 13 Apr 2022 13:43:27 +0200 Subject: [PATCH 46/85] Removed LeftMenuContext on v4 --- behat_ibexa_commerce.yaml | 1 - behat_ibexa_content.yaml | 1 - behat_ibexa_experience.yaml | 1 - behat_ibexa_oss.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 6c9f9fcf..82e09055 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -53,7 +53,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext - Ibexa\AdminUi\Behat\BrowserContext\DashboardContext - Ibexa\AdminUi\Behat\BrowserContext\LanguageContext - - Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 443e4bae..b3977359 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -46,7 +46,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext - Ibexa\AdminUi\Behat\BrowserContext\DashboardContext - Ibexa\AdminUi\Behat\BrowserContext\LanguageContext - - Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index b6d30fc2..dd4de565 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -55,7 +55,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext - Ibexa\AdminUi\Behat\BrowserContext\DashboardContext - Ibexa\AdminUi\Behat\BrowserContext\LanguageContext - - Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index a7acda22..fd6951db 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -108,7 +108,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext - Ibexa\AdminUi\Behat\BrowserContext\DashboardContext - Ibexa\AdminUi\Behat\BrowserContext\LanguageContext - - Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext From 99e4d7979eea538eb51694461375e4119d273c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 20 Apr 2022 11:28:52 +0200 Subject: [PATCH 47/85] Set up main branch to become 4.2 in the future --- .github/workflows/browser-tests.yaml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index ae65696f..86a09617 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.1.x-dev' + project-version: '4.2.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' secrets: @@ -23,7 +23,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.1.x-dev' + project-version: '4.2.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/composer.json b/composer.json index a0ea9d3a..b7fd022f 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "~4.1.0@dev", - "ibexa/core": "~4.1.0@dev", + "ibexa/http-cache": "~4.2.0@dev", + "ibexa/core": "~4.2.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -42,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "~4.1.0@dev", - "ibexa/rest": "~4.1.0@dev", + "ibexa/doctrine-schema": "~4.2.0@dev", + "ibexa/rest": "~4.2.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.1.x-dev" + "dev-main": "4.2.x-dev" } }, "bin": ["bin/ibexabehat", "bin/ibexareport"], From ffee122a3cf47d04835d0c7a675b3b357baea775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 26 Apr 2022 15:11:43 +0200 Subject: [PATCH 48/85] Removed generating Content Items with a random date (#15) --- src/lib/API/ContentData/ContentDataProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/API/ContentData/ContentDataProvider.php b/src/lib/API/ContentData/ContentDataProvider.php index 6f39f708..687ee642 100644 --- a/src/lib/API/ContentData/ContentDataProvider.php +++ b/src/lib/API/ContentData/ContentDataProvider.php @@ -51,7 +51,6 @@ public function getRandomContentData($language): ContentCreateStruct { $contentType = $this->contentTypeService->loadContentTypeByIdentifier($this->contentTypeIdentifier); $contentCreateStruct = $this->contentService->newContentCreateStruct($contentType, $language); - $contentCreateStruct->modificationDate = $this->randomDataGenerator->getRandomDateFromThePast(); return $this->fillContentStructWithData($contentType, $language, $language, $contentCreateStruct); } From a125dae282f6047e4754364868645812a99f02be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 5 May 2022 12:24:16 +0200 Subject: [PATCH 49/85] Fixed failing test --- features/examples/configuration.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/examples/configuration.feature b/features/examples/configuration.feature index 21622e1e..b7500455 100644 --- a/features/examples/configuration.feature +++ b/features/examples/configuration.feature @@ -17,5 +17,5 @@ Feature: Example scenarios showing how to set configuration """ And I append configuration to "default" siteaccess under "http_cache" key """ - purge_servers: ['http://my_purge_server'] + purge_servers: ['http://web'] """ From 09a0bfc85776acc1367e882561128e1d1d3b8a81 Mon Sep 17 00:00:00 2001 From: Jakub Brzegowski Date: Thu, 19 May 2022 11:24:49 +0200 Subject: [PATCH 50/85] IBX-2803: Fix drag and drop after React update (#18) --- src/lib/Browser/Element/RootElement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Browser/Element/RootElement.php b/src/lib/Browser/Element/RootElement.php index 1a0ec0c7..d4201fd7 100644 --- a/src/lib/Browser/Element/RootElement.php +++ b/src/lib/Browser/Element/RootElement.php @@ -31,7 +31,7 @@ public function dragAndDrop(string $from, string $hover, string $to): void throw new RuntimeException('drag-mock library has to be added to the page in order to use this method. Refer to README in BehatBundle for more information.'); } - $movingScript = sprintf('dragMock.dragStart(%s).dragOver(%s).delay(100).drop(%s);', $from, $hover, $to); + $movingScript = sprintf('{ const dragMockTmp = dragMock.dragStart(%s).delay(50).dragOver(%s).delay(50); setTimeout(() => dragMockTmp.drop(%s), 100); }', $from, $hover, $to); $this->session->getDriver()->executeScript($movingScript); } From 158f2cbaf46d4052c98105fe75513cdb9a253bd1 Mon Sep 17 00:00:00 2001 From: Ibexa Bot Date: Mon, 30 May 2022 13:24:55 +0200 Subject: [PATCH 51/85] added missing contexts (#275) (#20) --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + behat_ibexa_oss.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 82e09055..b66dc0b6 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -80,6 +80,7 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\Workflow\Behat\Context\WorkflowAdminContext - Ibexa\Workflow\Behat\Context\WorkflowContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index b3977359..a098c91f 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -60,6 +60,7 @@ regression: - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\Workflow\Behat\Context\WorkflowAdminContext - Ibexa\Workflow\Behat\Context\WorkflowContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index dd4de565..0730f3b4 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -76,6 +76,7 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\Workflow\Behat\Context\WorkflowAdminContext - Ibexa\Workflow\Behat\Context\WorkflowContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index fd6951db..71feb7eb 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -119,5 +119,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UDWContext - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext + - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\Behat\Browser\Context\DebuggingContext - Ibexa\User\Behat\Context\UserSetupContext From 436e0730bcef53daaa933c528d007f2d14e41635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 6 Jun 2022 15:42:08 +0200 Subject: [PATCH 52/85] Added containsElementsWithText assertion (#21) --- src/lib/Browser/Assert/CollectionAssert.php | 26 +++++++ .../Assert/CollectionAssertInterface.php | 2 + .../Debug/Interactive/CollectionAssert.php | 9 +++ .../Element/Assert/CollectionAssertTest.php | 77 +++++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 tests/Browser/Element/Assert/CollectionAssertTest.php diff --git a/src/lib/Browser/Assert/CollectionAssert.php b/src/lib/Browser/Assert/CollectionAssert.php index 439176cb..7119d9b9 100644 --- a/src/lib/Browser/Assert/CollectionAssert.php +++ b/src/lib/Browser/Assert/CollectionAssert.php @@ -9,6 +9,7 @@ namespace Ibexa\Behat\Browser\Assert; use Ibexa\Behat\Browser\Element\ElementCollectionInterface; +use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper; use Ibexa\Behat\Browser\Locator\LocatorInterface; use PHPUnit\Framework\Assert; @@ -83,4 +84,29 @@ public function countEquals(int $expectedCount): ElementCollectionInterface return $this->elementCollection; } + + public function containsElementsWithText(array $expectedElementTexts): ElementCollectionInterface + { + $elements = $this->elementCollection->toArray(); + $this->elementCollection->setElements($elements); + + $elementTexts = $this->elementCollection->mapBy(new ElementTextMapper()); + + foreach ($expectedElementTexts as $expectedElementText) { + Assert::assertContains( + $expectedElementText, + $elementTexts, + sprintf( + "Failed asserting that Collection created with %s locator '%s': '%s' contains elements '%s'. Found '%s' instead.", + $this->locator->getType(), + $this->locator->getIdentifier(), + $this->locator->getSelector(), + implode(',', $expectedElementTexts), + implode(',', $elementTexts), + ) + ); + } + + return $this->elementCollection; + } } diff --git a/src/lib/Browser/Assert/CollectionAssertInterface.php b/src/lib/Browser/Assert/CollectionAssertInterface.php index 6e5781f7..b2f9593a 100644 --- a/src/lib/Browser/Assert/CollectionAssertInterface.php +++ b/src/lib/Browser/Assert/CollectionAssertInterface.php @@ -17,4 +17,6 @@ public function isEmpty(): ElementCollectionInterface; public function hasElements(): ElementCollectionInterface; public function countEquals(int $expectedCount): ElementCollectionInterface; + + public function containsElementsWithText(array $expectedElementTexts): ElementCollectionInterface; } diff --git a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php index 5ecf94bf..7873a299 100644 --- a/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php +++ b/src/lib/Browser/Assert/Debug/Interactive/CollectionAssert.php @@ -51,4 +51,13 @@ public function countEquals(int $expectedCount): ElementCollectionInterface return $this->startInteractiveSessionOnException($exception, true); } } + + public function containsElementsWithText(array $expectedElementTexts): ElementCollectionInterface + { + try { + return $this->baseCollectionAssert->containsElementsWithText($expectedElementTexts); + } catch (ExpectationFailedException $exception) { + return $this->startInteractiveSessionOnException($exception, true); + } + } } diff --git a/tests/Browser/Element/Assert/CollectionAssertTest.php b/tests/Browser/Element/Assert/CollectionAssertTest.php new file mode 100644 index 00000000..75d8d41a --- /dev/null +++ b/tests/Browser/Element/Assert/CollectionAssertTest.php @@ -0,0 +1,77 @@ +locator = new XPathLocator('locator', '//'); + } + + /** + * @dataProvider provideForTestAssertionPasses + */ + public function testAssertionPasses(array $expectedElementTexts, array $actualElementTexts): void + { + $collection = $this->createElementCollection($actualElementTexts); + $collectionAssert = new CollectionAssert($this->locator, $collection); + $returnedCollection = $collectionAssert->containsElementsWithText($expectedElementTexts); + + $this->assertSame($collection, $returnedCollection); + } + + /** + * @dataProvider provideForTestAssertionFails + */ + public function testAssertionFails(array $expectedElementTexts, array $actualElementTexts): void + { + $this->expectException(ExpectationFailedException::class); + $collectionAssert = new CollectionAssert($this->locator, $this->createElementCollection($actualElementTexts)); + $collectionAssert->containsElementsWithText($expectedElementTexts); + } + + public function provideForTestAssertionPasses(): iterable + { + return [ + [[], []], + [[''], ['']], + [['Test1'], ['Test1']], + [['Test1', 'Test2'], ['Test1', 'Test2']], + [['Test1', 'Test2'], ['Test1', 'Test2', 'Test3']], + [['Test1', 'Test2'], ['Test3', 'Test2', 'Test1']], + [['Test1', 'Test2'], ['Test3', 'Test2', 'Test1']], + ]; + } + + public function provideForTestAssertionFails(): iterable + { + return [ + [['Test1'], ['Test2']], + [['Test1', 'Test2'], ['Test1']], + [['Test1', 'Test2'], ['Test1', 'Test1']], + ]; + } + + private function createElementCollection(array $elementTexts): ElementCollection + { + return new ElementCollection($this->locator, array_map(function (string $elementText) { + return $this->createElement($elementText); + }, $elementTexts)); + } +} From 33aff84a54b78a6b3a719d583e97ad9b5fee1953 Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:36:36 +0200 Subject: [PATCH 53/85] [Behat] IBX-2320 Added New context class path (#19) Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 2 ++ behat_ibexa_content.yaml | 3 +++ behat_ibexa_experience.yaml | 2 ++ .../setup/multirepository/multirepository.feature | 14 ++++++++------ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index b66dc0b6..53cbe1c4 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -31,6 +31,7 @@ regression: - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' + - '%paths.base%/vendor/ibexa/product-catalog/features' - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' @@ -79,6 +80,7 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormFieldConfigurationContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext + - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index a098c91f..3cfdf811 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -2,6 +2,7 @@ imports: - behat_ibexa_oss.yaml - vendor/ibexa/scheduler/behat_suites_content.yml - vendor/ibexa/workflow/behat_suites_content.yml + - vendor/ibexa/product-catalog/behat_suites.yml regression: suites: @@ -25,6 +26,7 @@ regression: - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/product-catalog/features' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: @@ -59,6 +61,7 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext + - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 0730f3b4..42027108 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -33,6 +33,7 @@ regression: - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' + - '%paths.base%/vendor/ibexa/product-catalog/features' - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' @@ -75,6 +76,7 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormFieldConfigurationContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext + - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/features/setup/multirepository/multirepository.feature b/features/setup/multirepository/multirepository.feature index f5e5cddc..23d66236 100644 --- a/features/setup/multirepository/multirepository.feature +++ b/features/setup/multirepository/multirepository.feature @@ -13,12 +13,14 @@ Feature: Multirepository setup for testing """ And I set configuration to "ibexa.repositories.new_repository" """ - storage: - engine: 'legacy' - connection: second_connection - config: {} - search: - connection: second_connection + storage: + engine: 'legacy' + connection: second_connection + config: {} + search: + connection: second_connection + product_catalog: + engine: default """ And I set configuration to "admin_group" siteaccess | key | value | From 690c2e26849d721fc8441e5a1dc4d1aefa695864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 10 Jun 2022 12:44:30 +0200 Subject: [PATCH 54/85] [Multirepository] Base new repository config on existing one (#22) * [Multirepository] Base new repository config on existing one * [CI] Enabled multirepo build --- .github/workflows/browser-tests.yaml | 1 + .../setup/multirepository/multirepository.feature | 12 +++++------- src/lib/Core/Configuration/ConfigurationEditor.php | 12 ++++++++++++ .../Configuration/ConfigurationEditorInterface.php | 2 ++ .../LocationAwareConfigurationEditor.php | 7 +++++++ src/lib/Core/Context/ConfigurationContext.php | 14 ++++++++++++-- .../Core/Configuration/ConfigurationEditorTest.php | 10 ++++++++++ 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index ae65696f..f2151bbd 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -16,6 +16,7 @@ jobs: project-version: '4.1.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' + multirepository: true secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} examples: diff --git a/features/setup/multirepository/multirepository.feature b/features/setup/multirepository/multirepository.feature index 23d66236..9a4ff5f0 100644 --- a/features/setup/multirepository/multirepository.feature +++ b/features/setup/multirepository/multirepository.feature @@ -11,16 +11,14 @@ Feature: Multirepository setup for testing second_connection: url: '%env(resolve:DATABASE_URL)%' """ - And I set configuration to "ibexa.repositories.new_repository" + Given I copy the configuration from "ibexa.repositories.default" to "ibexa.repositories.new_repository" + And I append configuration to "ibexa.repositories.new_repository.storage" """ - storage: - engine: 'legacy' connection: second_connection - config: {} - search: + """ + And I append configuration to "ibexa.repositories.new_repository.search" + """ connection: second_connection - product_catalog: - engine: default """ And I set configuration to "admin_group" siteaccess | key | value | diff --git a/src/lib/Core/Configuration/ConfigurationEditor.php b/src/lib/Core/Configuration/ConfigurationEditor.php index 658e0231..f2e91f70 100644 --- a/src/lib/Core/Configuration/ConfigurationEditor.php +++ b/src/lib/Core/Configuration/ConfigurationEditor.php @@ -112,6 +112,18 @@ private function getNewValue($currentValue, $value, bool $appendToExisting) return array_merge($currentValue, $value); } + + public function copyKey($config, string $keyName, string $newKeyName) + { + $propertyAccessor = PropertyAccess::createPropertyAccessor(); + + $key = $this->parseKey($keyName); + $newKey = $this->parseKey($newKeyName); + $currentValue = $propertyAccessor->getValue($config, $key); + $propertyAccessor->setValue($config, $newKey, $currentValue); + + return $config; + } } class_alias(ConfigurationEditor::class, 'EzSystems\Behat\Core\Configuration\ConfigurationEditor'); diff --git a/src/lib/Core/Configuration/ConfigurationEditorInterface.php b/src/lib/Core/Configuration/ConfigurationEditorInterface.php index 98a4570e..c2b2d04c 100644 --- a/src/lib/Core/Configuration/ConfigurationEditorInterface.php +++ b/src/lib/Core/Configuration/ConfigurationEditorInterface.php @@ -44,6 +44,8 @@ public function getConfigFromFile(string $filePath); * @param $config */ public function saveConfigToFile($filePath, $config): void; + + public function copyKey($config, string $keyName, string $newKeyName); } class_alias(ConfigurationEditorInterface::class, 'EzSystems\Behat\Core\Configuration\ConfigurationEditorInterface'); diff --git a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php index f2d14c71..bf5c6a03 100644 --- a/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php +++ b/src/lib/Core/Configuration/LocationAwareConfigurationEditor.php @@ -75,6 +75,13 @@ private function replaceSingleValue(&$value): void $value = $this->contentFacade->getLocationByLocationURL($matches[1])->id; } } + + public function copyKey($config, string $keyName, string $newKeyName) + { + $config = $this->innerConfigurationEditor->copyKey($config, $keyName, $newKeyName); + + return $this->resolveLocationReference($config); + } } class_alias(LocationAwareConfigurationEditor::class, 'EzSystems\Behat\Core\Configuration\LocationAwareConfigurationEditor'); diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index 099fe438..b7c5fd52 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -22,8 +22,6 @@ class ConfigurationContext implements Context private $ezplatformConfigFilePath; - private $configFilePath; - private $projectDir; /** @@ -154,6 +152,18 @@ private function shouldAppendValue(string $value): bool return 'append' === $value; } + + /** + * @Given I copy the configuration from :keyName to :newKeyName + * @Given I copy the configuration from :keyName to :newKeyName in :configFilePath + */ + public function iCopyTheConfigurationFromTo(string $keyName, string $newKeyName, string $configFilePath = null) + { + $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->ezplatformConfigFilePath; + $config = $this->configurationEditor->getConfigFromFile($configFilePath); + $config = $this->configurationEditor->copyKey($config, $keyName, $newKeyName); + $this->configurationEditor->saveConfigToFile($configFilePath, $config); + } } class_alias(ConfigurationContext::class, 'EzSystems\Behat\Core\Context\ConfigurationContext'); diff --git a/tests/lib/Core/Configuration/ConfigurationEditorTest.php b/tests/lib/Core/Configuration/ConfigurationEditorTest.php index f81bf243..ef25346f 100644 --- a/tests/lib/Core/Configuration/ConfigurationEditorTest.php +++ b/tests/lib/Core/Configuration/ConfigurationEditorTest.php @@ -283,6 +283,16 @@ public function testGetMultipleValues() Assert::assertEquals(['initialValue1', 'initialValue2'], $value); } + + public function testCopiesKey(): void + { + $configurationEditor = new ConfigurationEditor(); + $initialConfig = ['baseKey' => ['initialValue1' => 'nestedValue1', 'initialValue2']]; + + $changedConfig = $configurationEditor->copyKey($initialConfig, 'baseKey.initialValue1', 'baseKey.copiedKey'); + + Assert::assertEquals(['baseKey' => ['initialValue1' => 'nestedValue1', 'initialValue2', 'copiedKey' => 'nestedValue1']], $changedConfig); + } } class_alias(ConfigurationEditorTest::class, 'EzSystems\Behat\Test\Core\Configuration\ConfigurationEditorTest'); From 6cd9572942030cc12651d29efed94d06ed9146da Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Tue, 28 Jun 2022 12:23:13 +0200 Subject: [PATCH 55/85] [Behat] IBX-2739 Added test scenarios for attributes (#23) Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 2 ++ behat_ibexa_content.yaml | 2 ++ behat_ibexa_experience.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 53cbe1c4..0156a491 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -79,7 +79,9 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormBuilderContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFieldConfigurationContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext + - Ibexa\Migration\Behat\Context\MigrationContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext + - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 3cfdf811..5d42573f 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -61,6 +61,8 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext + - Ibexa\Migration\Behat\Context\MigrationContext + - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 42027108..68f0fa9a 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -75,7 +75,9 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormBuilderContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFieldConfigurationContext - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext + - Ibexa\Migration\Behat\Context\MigrationContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext + - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext From 41c1ef3a7002e8b1007dcf77da80fb0e959adbaa Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Thu, 30 Jun 2022 15:50:21 +0200 Subject: [PATCH 56/85] [Behat] IBX-2740 Implemeneted tests for Product Types (#24) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 0156a491..755d8395 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -83,6 +83,7 @@ regression: - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 5d42573f..40464c04 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -64,6 +64,7 @@ regression: - Ibexa\Migration\Behat\Context\MigrationContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 68f0fa9a..6454e446 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -79,6 +79,7 @@ regression: - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext From 7509d007ed0f5493c14b6719111ac70fe69c71ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 1 Jul 2022 12:02:08 +0200 Subject: [PATCH 57/85] [CI] Fixed running tests on main branch (#25) --- .github/workflows/browser-tests.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index f2151bbd..6c732644 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -3,7 +3,7 @@ name: Browser tests on: push: branches: - - master + - main - '[0-9]+.[0-9]+' pull_request: ~ diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a1d21d7..4469ac4b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main - '[0-9]+.[0-9]+' pull_request: ~ From cb643e8ad2982f16fa6132ab153380306ef394d3 Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Fri, 29 Jul 2022 10:06:54 +0200 Subject: [PATCH 58/85] [Behat] IBX-3048 Added tests for catalogs (#26) Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 755d8395..90d787e2 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -83,6 +83,7 @@ regression: - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 40464c04..3065aae8 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -64,6 +64,7 @@ regression: - Ibexa\Migration\Behat\Context\MigrationContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 6454e446..edb0a0f6 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -79,6 +79,7 @@ regression: - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext From 34a00ddbcc6eee96ad8ce86868c1dd7e68c2f643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 29 Jul 2022 11:11:08 +0200 Subject: [PATCH 59/85] [Browser tests] Added 40 min timeout to Admin UI tests --- .github/workflows/browser-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 6c732644..104bd5c8 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -17,6 +17,7 @@ jobs: test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' multirepository: true + timeout: 40 secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} examples: From 0d4da5eadece9c0b326c47493028f8c09b111770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 31 Aug 2022 10:50:57 +0200 Subject: [PATCH 60/85] Adjusted known issues detection to v4 (#34) --- .../Failure/KnownIssues/ContentTypeCreatedInTheBackground.php | 2 +- .../Core/Log/Failure/KnownIssues/TextBlockHeaderSelection.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php b/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php index 449a12ad..2bc289df 100644 --- a/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php +++ b/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php @@ -15,7 +15,7 @@ class ContentTypeCreatedInTheBackground implements KnownIssueInterface public function matches(TestFailureData $testFailureData): bool { return $testFailureData->applicationLogContainsFragment('DefaultChoiceListFactory') && - $testFailureData->applicationLogContainsFragment('Notice: Undefined index'); + $testFailureData->applicationLogContainsFragment('Warning: Undefined array key'); } public function getJiraReference(): string diff --git a/src/lib/Core/Log/Failure/KnownIssues/TextBlockHeaderSelection.php b/src/lib/Core/Log/Failure/KnownIssues/TextBlockHeaderSelection.php index a87ced72..54b2a0d4 100644 --- a/src/lib/Core/Log/Failure/KnownIssues/TextBlockHeaderSelection.php +++ b/src/lib/Core/Log/Failure/KnownIssues/TextBlockHeaderSelection.php @@ -14,7 +14,7 @@ class TextBlockHeaderSelection implements KnownIssueInterface { public function matches(TestFailureData $testFailureData): bool { - return $testFailureData->exceptionMessageContainsFragment("Could not find element named: 'Paragraph'. Found names") + return $testFailureData->exceptionMessageContainsFragment("Could not find element named: 'Paragraph'") && $testFailureData->exceptionStackTraceContainsFragment('RichText->changeStyle()'); } From c3bd38104f2bf1701a4ac6171cd5aacf7b4d07ca Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Thu, 1 Sep 2022 11:25:48 +0200 Subject: [PATCH 61/85] [Behat] IBX-2741 Implemeneted tests for Products (#32) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index ab8f323a..76dba5a2 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -86,6 +86,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext + - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 3065aae8..d1e4609d 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -66,6 +66,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext + - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index f7fc501c..62bd561c 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -83,6 +83,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext + - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext From d324154d954943402a3d8a64815eabde2a252034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 2 Sep 2022 12:11:48 +0200 Subject: [PATCH 62/85] Addressed leftover from rebranding --- src/lib/Core/Context/ConfigurationContext.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/Core/Context/ConfigurationContext.php b/src/lib/Core/Context/ConfigurationContext.php index 0bb28021..71ad5491 100644 --- a/src/lib/Core/Context/ConfigurationContext.php +++ b/src/lib/Core/Context/ConfigurationContext.php @@ -20,7 +20,7 @@ class ConfigurationContext implements Context private const SITEACCESS_KEY_FORMAT = 'ibexa.system.%s.%s'; private const SITEACCESS_MATCHER_KEY = 'ibexa.siteaccess.match'; - private $ezplatformConfigFilePath; + private $mainProjectConfigFilePath; private $projectDir; @@ -32,7 +32,7 @@ class ConfigurationContext implements Context public function __construct(string $projectDir, ConfigurationEditorInterface $configurationEditor) { $this->projectDir = $projectDir; - $this->ezplatformConfigFilePath = sprintf('%s/config/packages/ibexa.yaml', $projectDir); + $this->mainProjectConfigFilePath = sprintf('%s/config/packages/ibexa.yaml', $projectDir); $this->configurationEditor = $configurationEditor; } @@ -44,7 +44,7 @@ public function __construct(string $projectDir, ConfigurationEditorInterface $co */ public function iAddSiteaccessWithSettings($siteaccessName, $siteaccessGroup, TableNode $settings) { - $config = $this->configurationEditor->getConfigFromFile($this->ezplatformConfigFilePath); + $config = $this->configurationEditor->getConfigFromFile($this->mainProjectConfigFilePath); $config = $this->configurationEditor->append($config, 'ibexa.siteaccess.list', $siteaccessName); $config = $this->configurationEditor->append($config, sprintf('ibexa.siteaccess.groups.%s', $siteaccessGroup), $siteaccessName); @@ -55,7 +55,7 @@ public function iAddSiteaccessWithSettings($siteaccessName, $siteaccessGroup, Ta $config = $this->configurationEditor->set($config, sprintf(self::SITEACCESS_KEY_FORMAT, $siteaccessName, $key), $value); } - $this->configurationEditor->saveConfigToFile($this->ezplatformConfigFilePath, $config); + $this->configurationEditor->saveConfigToFile($this->mainProjectConfigFilePath, $config); } /** @@ -68,7 +68,7 @@ public function iAppendOrSetConfigurationToSiteaccess(string $mode, $siteaccessN { $appendToExisting = $this->shouldAppendValue($mode); - $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->ezplatformConfigFilePath; + $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->mainProjectConfigFilePath; $config = $this->configurationEditor->getConfigFromFile($configFilePath); @@ -96,7 +96,7 @@ public function iModifyConfigurationUnderKey(string $mode, $parentNode, PyString { $appendToExisting = $this->shouldAppendValue($mode); - $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->ezplatformConfigFilePath; + $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->mainProjectConfigFilePath; $config = $this->configurationEditor->getConfigFromFile($configFilePath); $parsedConfig = $this->parseConfig($configFragment); @@ -162,7 +162,7 @@ private function shouldAppendValue(string $value): bool */ public function iCopyTheConfigurationFromTo(string $keyName, string $newKeyName, string $configFilePath = null) { - $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->ezplatformConfigFilePath; + $configFilePath = $configFilePath ? sprintf('%s/%s', $this->projectDir, $configFilePath) : $this->mainProjectConfigFilePath; $config = $this->configurationEditor->getConfigFromFile($configFilePath); $config = $this->configurationEditor->copyKey($config, $keyName, $newKeyName); $this->configurationEditor->saveConfigToFile($configFilePath, $config); From f02bcea8477c1aea0beed78e7722175ecc33e83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 5 Sep 2022 09:38:11 +0200 Subject: [PATCH 63/85] Fixed codestyle (#36) --- tests/lib/Browser/Filter/BrowserLogFilterTest.php | 1 + tests/lib/Core/Behat/ArgumentParserTest.php | 1 + tests/lib/Core/Behat/ExtendedTableNodeTest.php | 1 + tests/lib/Core/Configuration/ConfigurationEditorTest.php | 1 + .../Core/Configuration/LocationAwareConfigurationEditorTest.php | 1 + tests/lib/Core/Log/LogFileReaderTest.php | 1 + 6 files changed, 6 insertions(+) diff --git a/tests/lib/Browser/Filter/BrowserLogFilterTest.php b/tests/lib/Browser/Filter/BrowserLogFilterTest.php index 6eb01479..daee2167 100644 --- a/tests/lib/Browser/Filter/BrowserLogFilterTest.php +++ b/tests/lib/Browser/Filter/BrowserLogFilterTest.php @@ -14,6 +14,7 @@ /** * @internal + * * @coversNothing */ class BrowserLogFilterTest extends TestCase diff --git a/tests/lib/Core/Behat/ArgumentParserTest.php b/tests/lib/Core/Behat/ArgumentParserTest.php index e3c0e668..ee764a3c 100644 --- a/tests/lib/Core/Behat/ArgumentParserTest.php +++ b/tests/lib/Core/Behat/ArgumentParserTest.php @@ -16,6 +16,7 @@ /** * @internal + * * @coversNothing */ class ArgumentParserTest extends TestCase diff --git a/tests/lib/Core/Behat/ExtendedTableNodeTest.php b/tests/lib/Core/Behat/ExtendedTableNodeTest.php index 58b66c24..325f5c57 100644 --- a/tests/lib/Core/Behat/ExtendedTableNodeTest.php +++ b/tests/lib/Core/Behat/ExtendedTableNodeTest.php @@ -18,6 +18,7 @@ * @license For full copyright and license information view LICENSE file distributed with this source code. * * @internal + * * @coversNothing */ class ExtendedTableNodeTest extends TestCase diff --git a/tests/lib/Core/Configuration/ConfigurationEditorTest.php b/tests/lib/Core/Configuration/ConfigurationEditorTest.php index ef25346f..d11f31c6 100644 --- a/tests/lib/Core/Configuration/ConfigurationEditorTest.php +++ b/tests/lib/Core/Configuration/ConfigurationEditorTest.php @@ -14,6 +14,7 @@ /** * @internal + * * @coversNothing */ class ConfigurationEditorTest extends TestCase diff --git a/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php b/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php index 8be96832..2bb31277 100644 --- a/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php +++ b/tests/lib/Core/Configuration/LocationAwareConfigurationEditorTest.php @@ -17,6 +17,7 @@ /** * @internal + * * @coversNothing */ class LocationAwareConfigurationEditorTest extends TestCase diff --git a/tests/lib/Core/Log/LogFileReaderTest.php b/tests/lib/Core/Log/LogFileReaderTest.php index 80b8c4c1..7ed42d45 100644 --- a/tests/lib/Core/Log/LogFileReaderTest.php +++ b/tests/lib/Core/Log/LogFileReaderTest.php @@ -15,6 +15,7 @@ /** * @internal + * * @coversNothing */ class LogFileReaderTest extends TestCase From fbb6150202faf711c6d438a98b11e2358c1dff22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 12 Sep 2022 12:27:10 +0200 Subject: [PATCH 64/85] Expanded log entries that match ContentTypeCreatedInTheBackground failure (#37) --- .../Failure/KnownIssues/ContentTypeCreatedInTheBackground.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php b/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php index 2bc289df..eb5bbdb9 100644 --- a/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php +++ b/src/lib/Core/Log/Failure/KnownIssues/ContentTypeCreatedInTheBackground.php @@ -15,7 +15,8 @@ class ContentTypeCreatedInTheBackground implements KnownIssueInterface public function matches(TestFailureData $testFailureData): bool { return $testFailureData->applicationLogContainsFragment('DefaultChoiceListFactory') && - $testFailureData->applicationLogContainsFragment('Warning: Undefined array key'); + ($testFailureData->applicationLogContainsFragment('Warning: Undefined array key') || + $testFailureData->applicationLogContainsFragment('Notice: Undefined index')); } public function getJiraReference(): string From cf0c97386d697fe491270a745404cb525c32a529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 19 Sep 2022 14:42:27 +0200 Subject: [PATCH 65/85] Set up main branch to become 4.3 in the future --- .github/workflows/browser-tests.yaml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index e969d164..a8f27a41 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.2.x-dev' + project-version: '4.3.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' multirepository: true @@ -25,7 +25,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.2.x-dev' + project-version: '4.3.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/composer.json b/composer.json index f4cd2006..ccb2dcae 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "~4.2.0@dev", - "ibexa/core": "~4.2.0@dev", + "ibexa/http-cache": "~4.3.0@dev", + "ibexa/core": "~4.3.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -42,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "~4.2.0@dev", - "ibexa/rest": "~4.2.0@dev", + "ibexa/doctrine-schema": "~4.3.0@dev", + "ibexa/rest": "~4.3.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.2.x-dev" + "dev-main": "4.3.x-dev" } }, "bin": ["bin/ibexabehat", "bin/ibexareport"], From 2ae82e0c6dc088f63cac7b09b833926cd648d30f Mon Sep 17 00:00:00 2001 From: tomaszszopinski <59650405+tomaszszopinski@users.noreply.github.com> Date: Thu, 22 Sep 2022 14:35:58 +0200 Subject: [PATCH 66/85] [Behat] IBX-3750 Added elementHasTextCondition (#40) * IBX-3750: added elementHasTextCondition * cs fix * review fixes * more cr fixes * fixed phpstan --- .../Condition/ElementHasTextCondition.php | 67 +++++++++++++++++++ .../Condition/ElementHasTextConditionTest.php | 49 ++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 src/lib/Browser/Element/Condition/ElementHasTextCondition.php create mode 100644 tests/lib/Browser/Element/Condition/ElementHasTextConditionTest.php diff --git a/src/lib/Browser/Element/Condition/ElementHasTextCondition.php b/src/lib/Browser/Element/Condition/ElementHasTextCondition.php new file mode 100644 index 00000000..46b3ea53 --- /dev/null +++ b/src/lib/Browser/Element/Condition/ElementHasTextCondition.php @@ -0,0 +1,67 @@ +searchedNode = $searchedNode; + $this->elementLocator = $elementLocator; + $this->expectedText = $expectedText; + } + + public function isMet(): bool + { + $currentTimeout = $this->searchedNode->getTimeout(); + $this->searchedNode->setTimeout(0); + $elements = $this->searchedNode->findAll($this->elementLocator); + $this->searchedNode->setTimeout($currentTimeout); + $this->foundElementsText = $elements->mapBy(new ElementTextMapper()); + + return in_array($this->expectedText, $this->foundElementsText); + } + + public function getErrorMessage(BaseElementInterface $invokingElement): string + { + return sprintf( + "The expected text '%s' matching %s locator '%s': '%s' was not found. Timeout value: %d seconds. Found values: %s", + $this->expectedText, + strtoupper($this->elementLocator->getType()), + $this->elementLocator->getIdentifier(), + $this->elementLocator->getSelector(), + $invokingElement->getTimeout(), + implode(',', $this->foundElementsText) + ); + } +} diff --git a/tests/lib/Browser/Element/Condition/ElementHasTextConditionTest.php b/tests/lib/Browser/Element/Condition/ElementHasTextConditionTest.php new file mode 100644 index 00000000..c0b80e53 --- /dev/null +++ b/tests/lib/Browser/Element/Condition/ElementHasTextConditionTest.php @@ -0,0 +1,49 @@ +createElementWithChildElement( + 'root', + $searchedElementLocator, + $this->createElement('DummyText') + ), + $searchedElementLocator, + 'DummyText' + ); + + Assert::assertTrue($condition->isMet()); + } + + public function testElemetDoesNotHaveText(): void + { + $searchedElementLocator = new CSSLocator('not-have-text-id', 'not-have-text-selector'); + $condition = new ElementHasTextCondition( + $this->createElementWithChildElement( + 'root', + new CSSLocator('dummy-id', 'dummy-selector'), + $this->createElement('DummyText') + ), + $searchedElementLocator, + 'Dummy1Text2' + ); + + Assert::assertFalse($condition->isMet()); + } +} From 4ed078ef5d3be6b78dd4ce56a84c3505957cd363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 29 Sep 2022 14:14:51 +0200 Subject: [PATCH 67/85] Adjusted IBX-1548 for v4 --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 2 ++ behat_ibexa_experience.yaml | 1 + behat_ibexa_oss.yaml | 2 ++ behat_suites.yml | 8 ++++---- .../contentTranslation/language_configuration.feature | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index ab5156d5..3f88b3de 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -12,6 +12,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index d6747893..b69d7621 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -14,6 +14,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_content.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -22,6 +23,7 @@ regression: - Ibexa\Behat\API\Context\UserContext - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\LanguageContext content: paths: - '%paths.base%/vendor/ibexa/scheduler/features' diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index be879fdb..a553ed41 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -17,6 +17,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index 1fade17f..d499b90d 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -73,6 +73,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' + - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -81,6 +82,7 @@ regression: - Ibexa\Behat\API\Context\UserContext - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext + - Ibexa\Behat\API\Context\LanguageContext oss: paths: - '%paths.base%/vendor/ibexa/admin-ui/features/personas' diff --git a/behat_suites.yml b/behat_suites.yml index a4299a58..d6989ae4 100644 --- a/behat_suites.yml +++ b/behat_suites.yml @@ -81,8 +81,8 @@ setup: - Ibexa\Behat\Core\Context\ConfigurationContext content-translation: paths: - - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/contentTranslation' + - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' contexts: - - EzSystems\Behat\Core\Context\ConfigurationContext - - EzSystems\Behat\API\Context\LanguageContext - - EzSystems\Behat\API\Context\TestContext + - Ibexa\Behat\Core\Context\ConfigurationContext + - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Behat\API\Context\TestContext diff --git a/features/setup/contentTranslation/language_configuration.feature b/features/setup/contentTranslation/language_configuration.feature index f2cdb500..6479c420 100644 --- a/features/setup/contentTranslation/language_configuration.feature +++ b/features/setup/contentTranslation/language_configuration.feature @@ -3,6 +3,6 @@ Feature: Language configuration for testing translations @admin @setup @translation Scenario: Add French language. Add it to admin panel configuration. Given Language "French" with code "fre-FR" exists - And I append configuration to "admin_group" siteaccess in "config/packages/ezplatform_admin_ui.yaml" + And I append configuration to "admin_group" siteaccess in "config/packages/ibexa_admin_ui.yaml" | key | value | | languages | fre-FR | From 61ed53364de94f8d0dfcd16d50c29c0f1acebb14 Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:29:51 +0100 Subject: [PATCH 68/85] Added path to PC setup (#46) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 3f88b3de..dbc70e03 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -13,6 +13,7 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' + - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index b69d7621..7e417537 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -15,6 +15,7 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_content.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' + - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index a553ed41..861385ff 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -18,6 +18,7 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature' - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' + - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext From cd546605e3f758659037f072b8704ce8ba3762ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 21 Nov 2022 13:01:33 +0100 Subject: [PATCH 69/85] Set up main branch to become 4.4 in the future --- .github/workflows/browser-tests.yaml | 4 ++-- composer.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index a8f27a41..78a0a8ce 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.3.x-dev' + project-version: '4.4.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' multirepository: true @@ -25,7 +25,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.3.x-dev' + project-version: '4.4.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/composer.json b/composer.json index ccb2dcae..2d93717c 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "~4.3.0@dev", - "ibexa/core": "~4.3.0@dev", + "ibexa/http-cache": "~4.4.0@dev", + "ibexa/core": "~4.4.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -42,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "~4.3.0@dev", - "ibexa/rest": "~4.3.0@dev", + "ibexa/doctrine-schema": "~4.4.0@dev", + "ibexa/rest": "~4.4.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.3.x-dev" + "dev-main": "4.4.x-dev" } }, "bin": ["bin/ibexabehat", "bin/ibexareport"], From d8258a5d5b197982c1f12cd90ac0424a28c28daa Mon Sep 17 00:00:00 2001 From: katarzynazawada Date: Mon, 21 Nov 2022 13:54:44 +0100 Subject: [PATCH 70/85] Added MigrationContext to setup --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index dbc70e03..ef6881e0 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -23,6 +23,7 @@ regression: - Ibexa\Behat\API\Context\UserContext - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext + - Ibexa\Migration\Behat\Context\MigrationContext commerce: paths: - '%paths.base%/vendor/ibexa/scheduler/features' diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 7e417537..c826644f 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -25,6 +25,7 @@ regression: - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext - Ibexa\Behat\API\Context\LanguageContext + - Ibexa\Migration\Behat\Context\MigrationContext content: paths: - '%paths.base%/vendor/ibexa/scheduler/features' diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 861385ff..d4f628e4 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -28,6 +28,7 @@ regression: - Ibexa\Behat\API\Context\UserContext - Ibexa\Behat\Core\Context\ConfigurationContext - Ibexa\Behat\Core\Context\FileContext + - Ibexa\Migration\Behat\Context\MigrationContext experience: paths: - '%paths.base%/vendor/ibexa/scheduler/features' From 086f2a57f651d7c893749501e65943caf23a46f5 Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Tue, 22 Nov 2022 09:28:57 +0100 Subject: [PATCH 71/85] Changed path to PC features (#49) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 2 +- behat_ibexa_content.yaml | 2 +- behat_ibexa_experience.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index ef6881e0..5cecab6a 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -34,7 +34,7 @@ regression: - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' - - '%paths.base%/vendor/ibexa/product-catalog/features' + - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index c826644f..7bf0f5a8 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -31,7 +31,7 @@ regression: - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' - - '%paths.base%/vendor/ibexa/product-catalog/features' + - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' - '%paths.base%/vendor/ibexa/version-comparison/features' diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index d4f628e4..38f5f85c 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -37,7 +37,7 @@ regression: - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' - - '%paths.base%/vendor/ibexa/product-catalog/features' + - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/workflow/features/browser' From 917510b59d07e082b68d5ea2e763b42798217f62 Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Fri, 2 Dec 2022 12:00:28 +0100 Subject: [PATCH 72/85] [Behat] IBX-3394 Added test scenarios for customer groups in product catalog (#50) Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 5cecab6a..3e9882d6 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -89,6 +89,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext + - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 7bf0f5a8..8fc4b194 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -71,6 +71,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext + - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 38f5f85c..14d84228 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -86,6 +86,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext + - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext From 7ac6d9924eb14551abc172b73aee6bfe86813553 Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Tue, 13 Dec 2022 11:49:30 +0100 Subject: [PATCH 73/85] IBX-4409 Implemented tests for currencies (#52) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 1 + behat_ibexa_content.yaml | 1 + behat_ibexa_experience.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 3e9882d6..b613bf75 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -92,6 +92,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext + - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 8fc4b194..04b1a231 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -74,6 +74,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext + - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 14d84228..e075f087 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -89,6 +89,7 @@ regression: - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext + - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext From e2c26ab9d8c00b9320297716702d3d1fc16e6e94 Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Thu, 22 Dec 2022 14:05:35 +0100 Subject: [PATCH 74/85] [Behat] IBX-3815: Commerce clean up (#51) --- behat_ibexa_commerce.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index b613bf75..74292ff0 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -1,7 +1,5 @@ imports: - behat_ibexa_experience.yaml - - vendor/ibexa/commerce-admin-ui/behat_suites.yml - - vendor/ibexa/commerce-shop/behat_suites.yml regression: suites: @@ -27,8 +25,6 @@ regression: commerce: paths: - '%paths.base%/vendor/ibexa/scheduler/features' - - '%paths.base%/vendor/ibexa/commerce-admin-ui/features/standard' - - '%paths.base%/vendor/ibexa/commerce-shop/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' - '%paths.base%/vendor/ibexa/form-builder/features' @@ -72,12 +68,6 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\CheckoutContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\FrontContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ManageAddressContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\ProductVariantContext - - Ibexa\Bundle\Commerce\ShopTools\Behat\Context\UserRegistrationContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext - Ibexa\FormBuilder\Behat\BrowserContext\FormAdministrationContext From 34a1cdb2be6578cd83d2f41b880155dd183dded3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 17 Jan 2023 10:04:42 +0100 Subject: [PATCH 75/85] Expanded possible login button names to include Storefront (#53) --- src/lib/Browser/Page/LoginPage.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Browser/Page/LoginPage.php b/src/lib/Browser/Page/LoginPage.php index 6049a827..6ba1713f 100644 --- a/src/lib/Browser/Page/LoginPage.php +++ b/src/lib/Browser/Page/LoginPage.php @@ -29,6 +29,7 @@ public function loginSuccessfully($username, $password): void $this->getHTMLPage()->findAll($this->getLocator('button')) ->filterBy(new LogicalOrCriterion([ new ElementTextCriterion('Login'), + new ElementTextCriterion('Log in'), new ElementTextCriterion('Sign in'), ])) ->single() From c6720eaab002523d719b20e13906a8d0893239b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 9 Feb 2023 09:03:03 +0100 Subject: [PATCH 76/85] [CI] Removed project version (#54) --- .github/workflows/browser-tests.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index a8f27a41..5aa51c2f 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -13,7 +13,6 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.3.x-dev' test-suite: '--profile=browser --suite=admin-ui-full' test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' multirepository: true @@ -25,7 +24,6 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: 'oss' - project-version: '4.3.x-dev' test-suite: '--mode=standard --profile=service --suite=examples' secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From e4986ee17897f1b8b35e0b7fba36a003c6d8da53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 21 Feb 2023 12:18:40 +0100 Subject: [PATCH 77/85] Set up main branch to become 4.5 in the future --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 6e4b6e25..8cd68c1b 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "ezsystems/allure-behat": "^3.3@dev", "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", - "ibexa/http-cache": "~4.4.0@dev", - "ibexa/core": "~4.4.0@dev", + "ibexa/http-cache": "~4.5.0@dev", + "ibexa/core": "~4.5.0@dev", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-extension": "^2.4", @@ -42,8 +42,8 @@ "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^3.0", "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-schema": "~4.4.0@dev", - "ibexa/rest": "~4.4.0@dev", + "ibexa/doctrine-schema": "~4.5.0@dev", + "ibexa/rest": "~4.5.0@dev", "mikey179/vfsstream": "^1.6" }, "autoload": { @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.4.x-dev" + "dev-main": "4.5.x-dev" } }, "bin": ["bin/ibexabehat", "bin/ibexareport"], From 2b623e14fa05398dde9eb163e4248cc4af06eee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 2 Mar 2023 12:17:18 +0100 Subject: [PATCH 78/85] [Composer] Limited doctrine/collections to ^1.8 (#58) --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3dbf0ece..6f6e199b 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "symfony/process": "^5.4", "symfony/property-access": "^5.0", "symfony/yaml": "^5.0", - "psy/psysh": "^0.10.8" + "psy/psysh": "^0.10.8", + "doctrine/collections": "^1.8" }, "require-dev": { "ibexa/code-style": "^1.0", From eac0e70aaf3f9d8dc2017ad96a0d42e6a664a0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 8 Mar 2023 12:44:39 +0100 Subject: [PATCH 79/85] [Composer] Removed doctrine/collections dependency (#60) * [Composer] Removed doctrine/collections dependency * Run AdminUI tests on PHP 8.1 --- .github/workflows/browser-tests.yaml | 1 + composer.json | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index 5aa51c2f..b97da6e2 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -17,6 +17,7 @@ jobs: test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard' multirepository: true timeout: 40 + php-image: "ezsystems/php:8.1-v2-node16" secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} examples: diff --git a/composer.json b/composer.json index 8eaa15db..990066ad 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "friends-of-behat/symfony-extension": "^2.1", "fakerphp/faker": "^1.17", "guzzlehttp/psr7": "^1.6.1", - "liuggio/fastest": "^1.7", + "liuggio/fastest": "^1.11", "php-http/client-common": "^2.1", "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0", "symfony/config": "^5.0", @@ -36,8 +36,7 @@ "symfony/process": "^5.4", "symfony/property-access": "^5.0", "symfony/yaml": "^5.0", - "psy/psysh": "^0.10.8", - "doctrine/collections": "^1.8" + "psy/psysh": "^0.10.8" }, "require-dev": { "ibexa/code-style": "^1.0", From f0ac6b7ddb3bc4fcc6fb9b44c6b4e563a1f420cd Mon Sep 17 00:00:00 2001 From: Bogdan Mazur <59828795+bogusez@users.noreply.github.com> Date: Mon, 20 Mar 2023 14:20:52 +0100 Subject: [PATCH 80/85] [Behat] IBX-4458 Added company creation test scenarios (#61) Co-authored-by: Bogdan Mazur --- behat_ibexa_commerce.yaml | 3 +++ behat_ibexa_experience.yaml | 4 ++++ composer.json | 3 ++- .../Element/Condition/ElementTransitionHasEndedCondition.php | 2 +- .../Condition/ElementTransitionHasEndedConditionTest.php | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 74292ff0..def015f2 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -12,6 +12,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature' + - '%paths.base%/vendor/ibexa/corporate-account/features/setup/setup.feature' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -27,6 +28,7 @@ regression: - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/corporate-account/features/browser' - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' @@ -68,6 +70,7 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext + - Ibexa\CorporateAccount\Behat\Context\CompaniesContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext - Ibexa\FormBuilder\Behat\BrowserContext\FormAdministrationContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index e075f087..819a804c 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -7,6 +7,7 @@ imports: - vendor/ibexa/site-factory/behat_suites.yml - vendor/ibexa/workflow/behat_suites_experience.yml - vendor/ibexa/segmentation/behat_suites.yml + - vendor/ibexa/corporate-account/behat_suites.yml regression: suites: @@ -19,6 +20,7 @@ regression: - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods' - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation' - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature' + - '%paths.base%/vendor/ibexa/corporate-account/features/setup/setup.feature' contexts: - Ibexa\Behat\API\Context\ContentContext - Ibexa\Behat\API\Context\ContentTypeContext @@ -34,6 +36,7 @@ regression: - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/corporate-account/features/browser' - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' @@ -75,6 +78,7 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext + - Ibexa\CorporateAccount\Behat\Context\CompaniesContext - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext - Ibexa\FormBuilder\Behat\BrowserContext\FormAdministrationContext diff --git a/composer.json b/composer.json index 990066ad..cd7bbd89 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,8 @@ "bin": ["bin/ibexabehat", "bin/ibexareport"], "config": { "allow-plugins": { - "composer/package-versions-deprecated": true + "composer/package-versions-deprecated": true, + "php-http/discovery": false } } } diff --git a/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php index 6f7fd3f8..f14b0e34 100644 --- a/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php +++ b/src/lib/Browser/Element/Condition/ElementTransitionHasEndedCondition.php @@ -56,7 +56,7 @@ public function getErrorMessage(BaseElementInterface $invokingElement): string ) : sprintf( - "Transition has not started at all for element with %s locator '%s': '%s'. Please make sure the condition is used on the correct element. Timeout value: %d seconds.", + "Transition has not started at all for element with %s locator '%s': '%s'. Please make sure that you have performed composer run post-install-cmd command before running tests locally and make sure that the condition is used on the correct element. Timeout value: %d seconds.", strtoupper($this->elementLocator->getType()), $this->elementLocator->getIdentifier(), $this->elementLocator->getSelector(), diff --git a/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php index d4645d85..818cbda6 100644 --- a/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php +++ b/tests/lib/Browser/Element/Condition/ElementTransitionHasEndedConditionTest.php @@ -57,7 +57,7 @@ public function testElementTransitionHasNotStarted(): void Assert::assertFalse($condition->isMet()); Assert::assertEquals( - "Transition has not started at all for element with CSS locator 'searched-id': 'searched-test'. Please make sure the condition is used on the correct element. Timeout value: 1 seconds.", + "Transition has not started at all for element with CSS locator 'searched-id': 'searched-test'. Please make sure that you have performed composer run post-install-cmd command before running tests locally and make sure that the condition is used on the correct element. Timeout value: 1 seconds.", $condition->getErrorMessage($baseElement) ); } From 9e4207b5092a6cb763aa6b5df41818a4ac566cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 23 Mar 2023 12:46:55 +0100 Subject: [PATCH 81/85] Selenium upgrade (#59) * Migrated to MinkPhpWebdriverExtension * Test flags * Fixed setting --- behat_ibexa_oss.yaml | 10 +++++++--- composer.json | 4 +++- .../Browser/FileUpload/FileUploadHelper.php | 20 ++++++++++++------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index d499b90d..f4380456 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -23,22 +23,26 @@ default: javascript_session: 'selenium' sessions: selenium: - selenium2: + webdriver: browser: chrome wd_host: '%env(string:SELENIUM_HOST)%' capabilities: extra_capabilities: - chromeOptions: - w3c: false + goog:chromeOptions: args: - "--window-size=1440,1080" - "--no-sandbox" # problem with different iframe host - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2758 - "--disable-features=site-per-process" + - "--disable-renderer-backgrounding" + - "--disable-background-timer-throttling" + - "--disable-backgrounding-occluded-windows" chrome: chrome: api_url: '%env(string:CHROMIUM_HOST)%' + OAndreyev\MinkPhpWebdriverExtension: ~ + DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~ FriendsOfBehat\SymfonyExtension: diff --git a/composer.json b/composer.json index 24ad98c1..752cdffc 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,9 @@ "symfony/process": "^5.4", "symfony/property-access": "^5.0", "symfony/yaml": "^5.0", - "psy/psysh": "^0.10.8" + "psy/psysh": "^0.10.8", + "oleg-andreyev/mink-phpwebdriver": "^1.2", + "oleg-andreyev/mink-phpwebdriver-extension": "^1.0" }, "require-dev": { "ibexa/code-style": "^1.0", diff --git a/src/lib/Browser/FileUpload/FileUploadHelper.php b/src/lib/Browser/FileUpload/FileUploadHelper.php index 8a14fd25..de5ec188 100644 --- a/src/lib/Browser/FileUpload/FileUploadHelper.php +++ b/src/lib/Browser/FileUpload/FileUploadHelper.php @@ -8,6 +8,7 @@ namespace Ibexa\Behat\Browser\FileUpload; +use Behat\Mink\Driver\Selenium2Driver; use Behat\Mink\Session; use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters; @@ -27,14 +28,19 @@ public function __construct(Session $session, MinkParameters $minkParameters) public function getRemoteFileUploadPath($filename) { - if (!preg_match('#[\w\\\/\.]*\.zip$#', $filename)) { - throw new \InvalidArgumentException('Zip archive required to upload to remote browser machine.'); - } - $localFile = sprintf('%s%s', $this->minkParameters['files_path'], $filename); + $driver = $this->session->getDriver(); + + if ($driver instanceof Selenium2Driver) { + if (!preg_match('#[\w\\\/\.]*\.zip$#', $filename)) { + throw new \InvalidArgumentException('Zip archive required to upload to remote browser machine.'); + } + + return $driver->getWebDriverSession()->file([ + 'file' => base64_encode(file_get_contents($localFile)), + ]); + } - return $this->session->getDriver()->getWebDriverSession()->file([ - 'file' => base64_encode(file_get_contents($localFile)), - ]); + return $localFile; } } From 71a1d7dd37410d6930c52f37e0b5ec9248088f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 11 Jul 2023 16:03:58 +0200 Subject: [PATCH 82/85] Added setting window size before each test (#68) * Added setting window size before each test * [CS] Fixed CS --- behat_ibexa_oss.yaml | 3 +- src/bundle/IbexaExtension.php | 28 ++++++++++ .../Subscriber/StartScenarioSubscriber.php | 55 +++++++++++++++++++ .../lib/Core/Behat/ExtendedTableNodeTest.php | 1 + 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/bundle/Subscriber/StartScenarioSubscriber.php diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index f4380456..fe8dffc1 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -30,7 +30,6 @@ default: extra_capabilities: goog:chromeOptions: args: - - "--window-size=1440,1080" - "--no-sandbox" # problem with different iframe host - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2758 - "--disable-features=site-per-process" @@ -51,6 +50,8 @@ default: Ibexa\Bundle\Behat\IbexaExtension: mink: default_javascript_session: '%env(string:MINK_DEFAULT_SESSION)%' + width: 1440 + height: 1080 Liuggio\Fastest\Behat\ListFeaturesExtension\Extension: ~ diff --git a/src/bundle/IbexaExtension.php b/src/bundle/IbexaExtension.php index 972e2e48..7947d498 100644 --- a/src/bundle/IbexaExtension.php +++ b/src/bundle/IbexaExtension.php @@ -15,6 +15,7 @@ use FriendsOfBehat\SymfonyExtension\ServiceContainer\SymfonyExtension; use Ibexa\Bundle\Behat\Extension\ExceptionStringer\PHPUnit10ExceptionStringer; use Ibexa\Bundle\Behat\Initializer\BehatSiteAccessInitializer; +use Ibexa\Bundle\Behat\Subscriber\StartScenarioSubscriber; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -26,6 +27,10 @@ class IbexaExtension implements Extension { private const MINK_DEFAULT_JAVASCRIPT_SESSION_PARAMETER = 'ibexa.platform.behat.mink.default_javascript_session'; + private const WIDTH_PARAMETER = 'ibexa.behat.browser.width'; + + private const HEIGHT_PARAMETER = 'ibexa.behat.browser.height'; + public function getConfigKey() { return 'ibexabehatextension'; @@ -50,6 +55,8 @@ public function configure(ArrayNodeDefinition $builder) ->arrayNode('mink') ->children() ->scalarNode('default_javascript_session')->defaultNull()->end() + ->scalarNode('width')->defaultValue(1440)->end() + ->scalarNode('height')->defaultValue(1080)->end() ->end() ->end() ->end(); @@ -59,6 +66,7 @@ public function load(ContainerBuilder $container, array $config) { $this->loadExceptionStringer($container); $this->loadSiteAccessInitializer($container); + $this->loadStartScenarioSubscriber($container); $this->setMinkParameters($container, $config); $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/Resources/config')); @@ -98,12 +106,32 @@ private function setMinkParameters(ContainerBuilder $container, array $config): $container->setParameter($parameter, $value); } } + + $container->setParameter(self::WIDTH_PARAMETER, (int) $config['mink']['width']); + $container->setParameter(self::HEIGHT_PARAMETER, (int) $config['mink']['height']); } private function setDefaultJavascriptSession(ContainerBuilder $container, string $defaultJavascriptSession): void { $container->setParameter('mink.javascript_session', $defaultJavascriptSession); } + + private function loadStartScenarioSubscriber(ContainerBuilder $container) + { + $definition = new Definition(StartScenarioSubscriber::class); + $definition->setArguments([ + new Reference(SymfonyExtension::KERNEL_ID), + $this->getParameterReference(self::WIDTH_PARAMETER), + $this->getParameterReference(self::HEIGHT_PARAMETER), + ]); + $definition->addTag(EventDispatcherExtension::SUBSCRIBER_TAG, ['priority' => StartScenarioSubscriber::PRIORITY]); + $container->setDefinition(StartScenarioSubscriber::class, $definition); + } + + private function getParameterReference(string $name): string + { + return '%' . $name . '%'; + } } class_alias(IbexaExtension::class, 'EzSystems\BehatBundle\BehatExtension'); diff --git a/src/bundle/Subscriber/StartScenarioSubscriber.php b/src/bundle/Subscriber/StartScenarioSubscriber.php new file mode 100644 index 00000000..1817c591 --- /dev/null +++ b/src/bundle/Subscriber/StartScenarioSubscriber.php @@ -0,0 +1,55 @@ +kernel = $kernel; + $this->width = $width; + $this->height = $height; + } + + public static function getSubscribedEvents() + { + return [ + ScenarioTested::BEFORE => ['resizeWindow', self::PRIORITY], + ExampleTested::BEFORE => ['resizeWindow', self::PRIORITY], + ]; + } + + public function resizeWindow(BeforeScenarioTested $event): void + { + if (!$event->getScenario()->hasTag('javascript') && !$event->getFeature()->hasTag('javascript')) { + return; + } + + $session = $this->kernel->getContainer()->get('behat.mink.default_session'); + if (!$session->isStarted()) { + $session->start(); + } + + $session->resizeWindow($this->width, $this->height); + } +} diff --git a/tests/lib/Core/Behat/ExtendedTableNodeTest.php b/tests/lib/Core/Behat/ExtendedTableNodeTest.php index 325f5c57..2d59634b 100644 --- a/tests/lib/Core/Behat/ExtendedTableNodeTest.php +++ b/tests/lib/Core/Behat/ExtendedTableNodeTest.php @@ -15,6 +15,7 @@ /** * @copyright Copyright (C) eZ Systems AS. All rights reserved. + * * @license For full copyright and license information view LICENSE file distributed with this source code. * * @internal From 92379bc05f2e900f5b14772e877faa118b6e1ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 23 Aug 2023 11:58:23 +0200 Subject: [PATCH 83/85] [CI] Bumped PHP version for CS-Fixer job --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4469ac4b..dc4ec36f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,7 +50,7 @@ jobs: strategy: matrix: php: - - '8.0' + - '8.1' steps: - uses: actions/checkout@v2 From a92e12d25f6d9e304b46e4143ffa5c2c451ad827 Mon Sep 17 00:00:00 2001 From: katarzynazawada <42930265+katarzynazawada@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:02:31 +0200 Subject: [PATCH 84/85] IBX-6334: Added payment config (#70) Co-authored-by: katarzynazawada <> --- behat_ibexa_commerce.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index def015f2..9cdea043 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -1,5 +1,6 @@ imports: - behat_ibexa_experience.yaml + - vendor/ibexa/payment/behat_suites.yml regression: suites: @@ -38,6 +39,7 @@ regression: - '%paths.base%/vendor/ibexa/workflow/features/browser' - '%paths.base%/vendor/ibexa/segmentation/features' - '%paths.base%/vendor/ibexa/version-comparison/features' + - '%paths.base%/vendor/ibexa/payment/features' filters: tags: "~@broken&&@IbexaCommerce" contexts: @@ -93,3 +95,4 @@ regression: - Ibexa\Workflow\Behat\Context\WorkflowAdminContext - Ibexa\Workflow\Behat\Context\WorkflowContext - Ibexa\Segmentation\Behat\Context\SegmentationContext + - Ibexa\Payment\Behat\Context\PaymentMethodsContext From 0ddb44329d8116ef5a59c0f2fd814c3de1d3546b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 25 Aug 2023 11:44:10 +0200 Subject: [PATCH 85/85] Add taxonomy test v45 (#74) * Changed ezstring data provider * Added ElementAttributeMapper * Added timeout setting * Added Taxonomy suites --- behat_ibexa_commerce.yaml | 36 ++++++++++--------- behat_ibexa_content.yaml | 26 ++++++++------ behat_ibexa_experience.yaml | 20 ++++++----- .../FieldTypeData/TextLineDataProvider.php | 11 ++++-- .../ContentData/FieldTypeNameConverter.php | 1 + src/lib/API/Context/ContentTypeContext.php | 9 ++++- src/lib/Browser/Element/BaseElement.php | 2 ++ .../Element/Mapper/ElementAttributeMapper.php | 26 ++++++++++++++ .../Mapper/ElementAttributeMapperTest.php | 32 +++++++++++++++++ ...TestCase.php => ElementTextMapperTest.php} | 2 +- 10 files changed, 126 insertions(+), 39 deletions(-) create mode 100644 src/lib/Browser/Element/Mapper/ElementAttributeMapper.php create mode 100644 tests/lib/Browser/Element/Mapper/ElementAttributeMapperTest.php rename tests/lib/Browser/Element/Mapper/{TextMapperTestCase.php => ElementTextMapperTest.php} (94%) diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml index 9cdea043..75ed85fa 100644 --- a/behat_ibexa_commerce.yaml +++ b/behat_ibexa_commerce.yaml @@ -26,30 +26,25 @@ regression: - Ibexa\Migration\Behat\Context\MigrationContext commerce: paths: - - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' - '%paths.base%/vendor/ibexa/corporate-account/features/browser' + - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' + - '%paths.base%/vendor/ibexa/payment/features' - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - - '%paths.base%/vendor/ibexa/user/features/browser' - - '%paths.base%/vendor/ibexa/workflow/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/segmentation/features' + - '%paths.base%/vendor/ibexa/taxonomy/features' + - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/version-comparison/features' - - '%paths.base%/vendor/ibexa/payment/features' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken&&@IbexaCommerce" contexts: - Behat\MinkExtension\Context\MinkContext - - Ibexa\Behat\API\Context\ContentContext - - Ibexa\Behat\API\Context\ContentTypeContext - - Ibexa\Behat\API\Context\RoleContext - - Ibexa\Behat\API\Context\TestContext - - Ibexa\Behat\API\Context\TrashContext - - Ibexa\Behat\API\Context\UserContext - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext - Ibexa\AdminUi\Behat\BrowserContext\BookmarkContext - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext @@ -70,6 +65,12 @@ regression: - Ibexa\AdminUi\Behat\BrowserContext\UDWContext - Ibexa\AdminUi\Behat\BrowserContext\UserNotificationContext - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext + - Ibexa\Behat\API\Context\ContentContext + - Ibexa\Behat\API\Context\ContentTypeContext + - Ibexa\Behat\API\Context\RoleContext + - Ibexa\Behat\API\Context\TestContext + - Ibexa\Behat\API\Context\TrashContext + - Ibexa\Behat\API\Context\UserContext - Ibexa\Behat\Browser\Context\AuthenticationContext - Ibexa\Behat\Browser\Context\DebuggingContext - Ibexa\CorporateAccount\Behat\Context\CompaniesContext @@ -81,18 +82,21 @@ regression: - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext - Ibexa\Migration\Behat\Context\MigrationContext - Ibexa\PageBuilder\Behat\Context\PageBuilderContext - - Ibexa\ProductCatalog\Behat\Context\AttributesContext + - Ibexa\Payment\Behat\Context\PaymentMethodsContext - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext + - Ibexa\ProductCatalog\Behat\Context\AttributesContext - Ibexa\ProductCatalog\Behat\Context\CatalogsContext + - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\ProductCatalog\Behat\Context\ProductsContext - - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext + - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\Segmentation\Behat\Context\SegmentationContext + - Ibexa\Segmentation\Behat\Context\SegmentationContext + - Ibexa\Taxonomy\Behat\Context\Browser\TaxonomyContext + - Ibexa\Taxonomy\Behat\Context\Service\TaxonomyContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\VersionComparison\Behat\Context\VersionComparisonContext - Ibexa\Workflow\Behat\Context\WorkflowAdminContext - Ibexa\Workflow\Behat\Context\WorkflowContext - - Ibexa\Segmentation\Behat\Context\SegmentationContext - - Ibexa\Payment\Behat\Context\PaymentMethodsContext diff --git a/behat_ibexa_content.yaml b/behat_ibexa_content.yaml index 04b1a231..aaeeb3e8 100644 --- a/behat_ibexa_content.yaml +++ b/behat_ibexa_content.yaml @@ -1,9 +1,10 @@ imports: - behat_ibexa_oss.yaml - - vendor/ibexa/scheduler/behat_suites_content.yml - - vendor/ibexa/workflow/behat_suites_content.yml - vendor/ibexa/product-catalog/behat_suites.yml + - vendor/ibexa/scheduler/behat_suites_content.yml + - vendor/ibexa/taxonomy/behat_suites_content.yml - vendor/ibexa/version-comparison/behat_suites.yml + - vendor/ibexa/workflow/behat_suites_content.yml regression: suites: @@ -28,13 +29,14 @@ regression: - Ibexa\Migration\Behat\Context\MigrationContext content: paths: - - '%paths.base%/vendor/ibexa/scheduler/features' - - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - - '%paths.base%/vendor/ibexa/admin-ui/features/standard' - - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - - '%paths.base%/vendor/ibexa/user/features/browser' - - '%paths.base%/vendor/ibexa/workflow/features/browser' - - '%paths.base%/vendor/ibexa/version-comparison/features' + - '%paths.base%/vendor/ibexa/admin-ui/features/personas' + - '%paths.base%/vendor/ibexa/admin-ui/features/standard' + - '%paths.base%/vendor/ibexa/product-catalog/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' + - '%paths.base%/vendor/ibexa/taxonomy/features' + - '%paths.base%/vendor/ibexa/user/features/browser' + - '%paths.base%/vendor/ibexa/version-comparison/features' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken&&@IbexaContent" contexts: @@ -73,9 +75,11 @@ regression: - Ibexa\ProductCatalog\Behat\Context\CatalogsContext - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext - - Ibexa\ProductCatalog\Behat\Context\ProductsContext - - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext + - Ibexa\ProductCatalog\Behat\Context\ProductsContext + - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\Taxonomy\Behat\Context\Browser\TaxonomyContext + - Ibexa\Taxonomy\Behat\Context\Service\TaxonomyContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\VersionComparison\Behat\Context\VersionComparisonContext diff --git a/behat_ibexa_experience.yaml b/behat_ibexa_experience.yaml index 819a804c..09c99c1b 100644 --- a/behat_ibexa_experience.yaml +++ b/behat_ibexa_experience.yaml @@ -1,13 +1,14 @@ imports: - behat_ibexa_content.yaml - - vendor/ibexa/scheduler/behat_suites_experience.yml + - vendor/ibexa/corporate-account/behat_suites.yml + - vendor/ibexa/fieldtype-page/behat_suites.yml - vendor/ibexa/form-builder/behat_suites.yml - vendor/ibexa/page-builder/behat_suites.yml - - vendor/ibexa/fieldtype-page/behat_suites.yml + - vendor/ibexa/scheduler/behat_suites_experience.yml + - vendor/ibexa/segmentation/behat_suites.yml - vendor/ibexa/site-factory/behat_suites.yml + - vendor/ibexa/taxonomy/behat_suites_experience.yml - vendor/ibexa/workflow/behat_suites_experience.yml - - vendor/ibexa/segmentation/behat_suites.yml - - vendor/ibexa/corporate-account/behat_suites.yml regression: suites: @@ -33,19 +34,20 @@ regression: - Ibexa\Migration\Behat\Context\MigrationContext experience: paths: - - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/admin-ui/features/personas' - '%paths.base%/vendor/ibexa/admin-ui/features/standard' - '%paths.base%/vendor/ibexa/corporate-account/features/browser' + - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - '%paths.base%/vendor/ibexa/form-builder/features' - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage' - '%paths.base%/vendor/ibexa/page-builder/features/personas' - '%paths.base%/vendor/ibexa/product-catalog/features/browser' - - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource' - - '%paths.base%/vendor/ibexa/user/features/browser' - - '%paths.base%/vendor/ibexa/workflow/features/browser' + - '%paths.base%/vendor/ibexa/scheduler/features' - '%paths.base%/vendor/ibexa/segmentation/features' + - '%paths.base%/vendor/ibexa/taxonomy/features' + - '%paths.base%/vendor/ibexa/user/features/browser' - '%paths.base%/vendor/ibexa/version-comparison/features' + - '%paths.base%/vendor/ibexa/workflow/features/browser' filters: tags: "~@broken&&@IbexaExperience" contexts: @@ -95,6 +97,8 @@ regression: - Ibexa\ProductCatalog\Behat\Context\ProductsContext - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext + - Ibexa\Taxonomy\Behat\Context\Browser\TaxonomyContext + - Ibexa\Taxonomy\Behat\Context\Service\TaxonomyContext - Ibexa\User\Behat\Context\UserSettingsContext - Ibexa\User\Behat\Context\UserSetupContext - Ibexa\VersionComparison\Behat\Context\VersionComparisonContext diff --git a/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php b/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php index 778067ce..cf95b421 100644 --- a/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php +++ b/src/lib/API/ContentData/FieldTypeData/TextLineDataProvider.php @@ -8,6 +8,8 @@ namespace Ibexa\Behat\API\ContentData\FieldTypeData; +use Ibexa\Core\FieldType\TextLine\Value; + class TextLineDataProvider extends AbstractFieldTypeDataProvider { public function supports(string $fieldTypeIdentifier): bool @@ -15,11 +17,16 @@ public function supports(string $fieldTypeIdentifier): bool return 'ezstring' === $fieldTypeIdentifier; } - public function generateData(string $contentTypeIdentifier, string $fieldIdentifier, string $language = 'eng-GB'): string + public function generateData(string $contentTypeIdentifier, string $fieldIdentifier, string $language = 'eng-GB'): Value { $this->setLanguage($language); - return $this->getFaker()->realText(80, 1); + return new Value($this->getFaker()->realText(80, 1)); + } + + public function parseFromString(string $value): Value + { + return new Value($value); } } diff --git a/src/lib/API/ContentData/FieldTypeNameConverter.php b/src/lib/API/ContentData/FieldTypeNameConverter.php index 337b22eb..6558c7a0 100644 --- a/src/lib/API/ContentData/FieldTypeNameConverter.php +++ b/src/lib/API/ContentData/FieldTypeNameConverter.php @@ -41,6 +41,7 @@ class FieldTypeNameConverter 'eztime' => 'Time', 'ezurl' => 'URL', 'ezuser' => 'User account', + 'ibexa_taxonomy_entry_assignment' => 'Taxonomy Entry Assignment', ]; public static function getFieldTypeNameByIdentifier(string $fieldTypeIdentifier): string diff --git a/src/lib/API/Context/ContentTypeContext.php b/src/lib/API/Context/ContentTypeContext.php index a38bf86a..a2730f14 100644 --- a/src/lib/API/Context/ContentTypeContext.php +++ b/src/lib/API/Context/ContentTypeContext.php @@ -76,7 +76,6 @@ private function parseBool(string $value): bool private function parseFieldSettings(string $fieldTypeIdentifier, string $settings) { $parsedSettings = []; - // TODO: Clean this up in the future if needed switch ($fieldTypeIdentifier) { case 'ezcontentquery': return $this->parseContentQuerySettings($settings); @@ -87,6 +86,9 @@ private function parseFieldSettings(string $fieldTypeIdentifier, string $setting case 'ezselection': return $this->parseSelectionSettings($settings); + case 'ibexa_taxonomy_entry_assignment': + return $this->parseTaxonomySettings($settings); + default: return $parsedSettings; } @@ -141,6 +143,11 @@ private function parseContentQuerySettings(string $settings): array return $parsedSettings; } + + private function parseTaxonomySettings(string $settings): array + { + return ['taxonomy' => $settings]; + } } class_alias(ContentTypeContext::class, 'EzSystems\Behat\API\Context\ContentTypeContext'); diff --git a/src/lib/Browser/Element/BaseElement.php b/src/lib/Browser/Element/BaseElement.php index faf33c83..9c52f53e 100644 --- a/src/lib/Browser/Element/BaseElement.php +++ b/src/lib/Browser/Element/BaseElement.php @@ -89,6 +89,8 @@ function () use ($locator) { $wrappedElement = $this->elementFactory->createElement($this->elementFactory, $locator, $foundMinkElement); if ($locator->elementMeetsCriteria($wrappedElement)) { + $wrappedElement->setTimeout($this->getTimeout()); + return $wrappedElement; } } diff --git a/src/lib/Browser/Element/Mapper/ElementAttributeMapper.php b/src/lib/Browser/Element/Mapper/ElementAttributeMapper.php new file mode 100644 index 00000000..c3d94c3d --- /dev/null +++ b/src/lib/Browser/Element/Mapper/ElementAttributeMapper.php @@ -0,0 +1,26 @@ +attribute = $attribute; + } + + public function map(ElementInterface $element): string + { + return $element->getAttribute($this->attribute); + } +} diff --git a/tests/lib/Browser/Element/Mapper/ElementAttributeMapperTest.php b/tests/lib/Browser/Element/Mapper/ElementAttributeMapperTest.php new file mode 100644 index 00000000..3d049e32 --- /dev/null +++ b/tests/lib/Browser/Element/Mapper/ElementAttributeMapperTest.php @@ -0,0 +1,32 @@ +mapper = new ElementAttributeMapper('data-id'); + } + + public function testMapsSingleElement(): void + { + $element = $this->createStub(ElementInterface::class); + $element->method('getAttribute')->willReturn('AttributeValue'); + + Assert::assertEquals('AttributeValue', $this->mapper->map($element)); + } +} diff --git a/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php b/tests/lib/Browser/Element/Mapper/ElementTextMapperTest.php similarity index 94% rename from tests/lib/Browser/Element/Mapper/TextMapperTestCase.php rename to tests/lib/Browser/Element/Mapper/ElementTextMapperTest.php index 37c2966d..5b84c7f8 100644 --- a/tests/lib/Browser/Element/Mapper/TextMapperTestCase.php +++ b/tests/lib/Browser/Element/Mapper/ElementTextMapperTest.php @@ -12,7 +12,7 @@ use Ibexa\Tests\Behat\Browser\Element\BaseTestCase; use PHPUnit\Framework\Assert; -class TextMapperTestCase extends BaseTestCase +class ElementTextMapperTest extends BaseTestCase { /** @var \Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper */ private $mapper;