diff --git a/.github/workflows/grumphp.yml b/.github/workflows/grumphp.yml index 19987e6..98b287d 100644 --- a/.github/workflows/grumphp.yml +++ b/.github/workflows/grumphp.yml @@ -18,12 +18,11 @@ jobs: fail-fast: false matrix: php-versions: - - "7.4" - - "8.0" - "8.1" - # - '8.2' + - "8.2" + - "8.3" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@v2 @@ -34,11 +33,9 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} - # Use composer.json for key, if composer.lock is not committed. - # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- - run: composer self-update --2 @@ -52,25 +49,25 @@ jobs: run: php vendor/bin/grumphp run -vvv - name: Install Composer dependencies without dev run: rm -fR vendor && composer install --no-progress --prefer-dist --optimize-autoloader --no-dev - if: matrix.php-versions == '7.4' + if: matrix.php-versions == '8.1' - name: Install Box - run: wget https://github.com/box-project/box/releases/download/3.13.0/box.phar - if: matrix.php-versions == '7.4' + run: wget https://github.com/box-project/box/releases/download/4.5.1/box.phar + if: matrix.php-versions == '8.1' - name: Compile phar run: php box.phar compile - if: matrix.php-versions == '7.4' + if: matrix.php-versions == '8.1' - name: Compile Result run: ls -lah - if: matrix.php-versions == '7.4' + if: matrix.php-versions == '8.1' - name: Compile Result Upload - if: matrix.php-versions == '7.4' + if: matrix.php-versions == '8.1' uses: actions/upload-artifact@v3 with: name: jeeves_new.phar path: jeeves.phar - name: Upload to Releases uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') && matrix.php-versions == '7.4' + if: startsWith(github.ref, 'refs/tags/') && matrix.php-versions == '8.1' with: files: jeeves.phar token: ${{ secrets.token }} diff --git a/composer.json b/composer.json index e1800cc..b15e28a 100644 --- a/composer.json +++ b/composer.json @@ -10,23 +10,23 @@ ], "description": "cli tool to generate M2 code", "require": { - "symfony/console": "^5.0", - "symfony/filesystem": "^5.0", - "symfony/yaml": "^5.0", + "symfony/console": "^6.0", + "symfony/filesystem": "^6.0", + "symfony/yaml": "^6.0", "sabre/xml": "^4.0", - "nette/php-generator": "^3.0|^4.0", - "consolidation/self-update": "^2.0.3", - "mygento/coding-standard": "~2.14.0-beta5" + "nette/php-generator": "^4.1", + "consolidation/self-update": "^2.2.0", + "mygento/coding-standard": "~2.14.0" }, "require-dev": { - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^10.0" }, "autoload": { "psr-4": { "Mygento\\Jeeves\\": "src/Jeeves" } }, "config": { "platform": { - "php": "7.4.20" + "php": "8.1.20" }, "allow-plugins": { "phpro/grumphp": true diff --git a/src/Jeeves/Console/Application.php b/src/Jeeves/Console/Application.php index 028e63b..0de38cc 100644 --- a/src/Jeeves/Console/Application.php +++ b/src/Jeeves/Console/Application.php @@ -31,7 +31,7 @@ public function __construct() /** * {@inheritdoc} */ - public function run(InputInterface $input = null, OutputInterface $output = null) + public function run(InputInterface $input = null, OutputInterface $output = null): int { if (null === $output) { $output = Factory::createOutput(); @@ -71,7 +71,7 @@ public function getIO() /** * Initializes all commands. */ - protected function getDefaultCommands() + protected function getDefaultCommands(): array { $selfUpdate = new SelfUpdateCommand(self::NAME, self::VERSION, 'mygento/jeeves'); diff --git a/src/Jeeves/Console/Command/BaseCommand.php b/src/Jeeves/Console/Command/BaseCommand.php index 1f7acb7..bdc6b71 100644 --- a/src/Jeeves/Console/Command/BaseCommand.php +++ b/src/Jeeves/Console/Command/BaseCommand.php @@ -63,7 +63,7 @@ protected function writeFile($path, $content) $io = $this->getIO(); $io->write(sprintf('Creating: %s.', $path)); - return $fs->dumpFile($path, $content); + $fs->dumpFile($path, $content); } protected function runCodeStyleFixer() diff --git a/src/Jeeves/Generators/Crud/Repositories/Repository.php b/src/Jeeves/Generators/Crud/Repositories/Repository.php index aede0b8..d59d8e0 100644 --- a/src/Jeeves/Generators/Crud/Repositories/Repository.php +++ b/src/Jeeves/Generators/Crud/Repositories/Repository.php @@ -22,7 +22,7 @@ public function genRepository( $typehint = $this->hasTypes($phpVersion); $constructorProp = $this->hasConstructorProp($phpVersion); $readonlyProp = $this->hasReadOnlyProp($phpVersion); - $readonlyClass = false; //$this->hasReadOnlyClass($phpVersion); + $readonlyClass = $this->hasReadOnlyClass($phpVersion); $namespace = new PhpNamespace($rootNamespace . '\Model'); $namespace->addUse('\Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface'); @@ -34,8 +34,8 @@ public function genRepository( $class->setImplements([$repoInterface]); $class->setComment('@SuppressWarnings(PHPMD.CouplingBetweenObjects)'); - if ($readonlyClass) { /** @phpstan-ignore-line */ - $class->setReadOnly($readonlyClass); /** @phpstan-ignore-line */ + if ($readonlyClass) { + $class->setReadOnly($readonlyClass); } if (!$constructorProp) { @@ -84,22 +84,22 @@ public function genRepository( if ($constructorProp) { $construct ->addPromotedParameter('resource') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType($resource); $construct ->addPromotedParameter('collectionFactory') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType($collection . 'Factory'); $construct ->addPromotedParameter('entityFactory') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType($entityInterface . 'Factory'); $construct ->addPromotedParameter('searchResultsFactory') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType($results . 'Factory'); } else { @@ -132,7 +132,7 @@ public function genRepository( if ($constructorProp) { $construct ->addPromotedParameter('storeManager') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType('\Magento\Store\Model\StoreManagerInterface'); } else { @@ -157,7 +157,7 @@ public function genRepository( if ($constructorProp) { $construct->addPromotedParameter('collectionProcessor') - ->setReadOnly($readonlyProp && !$readonlyClass) /** @phpstan-ignore-line */ + ->setReadOnly($readonlyProp && !$readonlyClass) ->setPrivate() ->setType('Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface'); } else { @@ -218,17 +218,17 @@ public function genRepository( $save->addBody( ($withStore ? 'if (empty($entity->getStoreId())) {' . PHP_EOL - . self::TAB . '$entity->setStoreId([$this->storeManager->getStore()->getId()]);' . PHP_EOL - . '}' . PHP_EOL : '') - . 'try {' . PHP_EOL - . self::TAB . '$this->resource->save($entity);' . PHP_EOL - . '} catch (\Exception $exception) {' . PHP_EOL - . self::TAB . 'throw new CouldNotSaveException(' . PHP_EOL - . self::TAB . self::TAB . '__(\'Could not save the ' . $print . '\'),' . PHP_EOL - . self::TAB . self::TAB . '$exception' . PHP_EOL - . self::TAB . ');' . PHP_EOL - . '}' . PHP_EOL - . 'return $entity;' + . self::TAB . '$entity->setStoreId([$this->storeManager->getStore()->getId()]);' . PHP_EOL + . '}' . PHP_EOL : '') + . 'try {' . PHP_EOL + . self::TAB . '$this->resource->save($entity);' . PHP_EOL + . '} catch (\Exception $exception) {' . PHP_EOL + . self::TAB . 'throw new CouldNotSaveException(' . PHP_EOL + . self::TAB . self::TAB . '__(\'Could not save the ' . $print . '\'),' . PHP_EOL + . self::TAB . self::TAB . '$exception' . PHP_EOL + . self::TAB . ');' . PHP_EOL + . '}' . PHP_EOL + . 'return $entity;' ); $delete = $class->addMethod('delete')->setVisibility('public'); @@ -290,14 +290,14 @@ public function genRepository( } $getList->setBody('/** @var ' . $collection . ' $collection */' . PHP_EOL - . '$collection = $this->collectionFactory->create();' . PHP_EOL . PHP_EOL - . '$this->collectionProcessor->process($criteria, $collection);' . PHP_EOL . PHP_EOL - . '/** @var ' . $namespace->simplifyName($results) . ' $searchResults */' . PHP_EOL - . '$searchResults = $this->searchResultsFactory->create();' . PHP_EOL - . '$searchResults->setSearchCriteria($criteria);' . PHP_EOL - . '$searchResults->setItems($collection->getItems());' . PHP_EOL - . '$searchResults->setTotalCount($collection->getSize());' . PHP_EOL - . 'return $searchResults;'); + . '$collection = $this->collectionFactory->create();' . PHP_EOL . PHP_EOL + . '$this->collectionProcessor->process($criteria, $collection);' . PHP_EOL . PHP_EOL + . '/** @var ' . $namespace->simplifyName($results) . ' $searchResults */' . PHP_EOL + . '$searchResults = $this->searchResultsFactory->create();' . PHP_EOL + . '$searchResults->setSearchCriteria($criteria);' . PHP_EOL + . '$searchResults->setItems($collection->getItems());' . PHP_EOL + . '$searchResults->setTotalCount($collection->getSize());' . PHP_EOL + . 'return $searchResults;'); return $namespace; } diff --git a/src/Jeeves/IO/BaseIO.php b/src/Jeeves/IO/BaseIO.php index 66db738..4e880aa 100644 --- a/src/Jeeves/IO/BaseIO.php +++ b/src/Jeeves/IO/BaseIO.php @@ -9,11 +9,8 @@ abstract class BaseIO implements IOInterface, LoggerInterface { /** * System is unusable. - * - * @param string $message - * @param array $context */ - public function emergency($message, array $context = []) + public function emergency(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::EMERGENCY, $message, $context); } @@ -23,11 +20,8 @@ public function emergency($message, array $context = []) * * Example: Entire website down, database unavailable, etc. This should * trigger the SMS alerts and wake you up. - * - * @param string $message - * @param array $context */ - public function alert($message, array $context = []) + public function alert(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::ALERT, $message, $context); } @@ -36,11 +30,8 @@ public function alert($message, array $context = []) * Critical conditions. * * Example: Application component unavailable, unexpected exception. - * - * @param string $message - * @param array $context */ - public function critical($message, array $context = []) + public function critical(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::CRITICAL, $message, $context); } @@ -48,11 +39,8 @@ public function critical($message, array $context = []) /** * Runtime errors that do not require immediate action but should typically * be logged and monitored. - * - * @param string $message - * @param array $context */ - public function error($message, array $context = []) + public function error(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::ERROR, $message, $context); } @@ -66,18 +54,15 @@ public function error($message, array $context = []) * @param string $message * @param array $context */ - public function warning($message, array $context = []) + public function warning(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::WARNING, $message, $context); } /** * Normal but significant events. - * - * @param string $message - * @param array $context */ - public function notice($message, array $context = []) + public function notice(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::NOTICE, $message, $context); } @@ -86,34 +71,25 @@ public function notice($message, array $context = []) * Interesting events. * * Example: User logs in, SQL logs. - * - * @param string $message - * @param array $context */ - public function info($message, array $context = []) + public function info(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::INFO, $message, $context); } /** * Detailed debug information. - * - * @param string $message - * @param array $context */ - public function debug($message, array $context = []) + public function debug(string|\Stringable $message, array $context = []): void { $this->log(LogLevel::DEBUG, $message, $context); } /** * Logs with an arbitrary level. - * * @param mixed $level - * @param string $message - * @param array $context */ - public function log($level, $message, array $context = []) + public function log($level, string|\Stringable $message, array $context = []): void { if (in_array($level, [LogLevel::EMERGENCY, LogLevel::ALERT, LogLevel::CRITICAL, LogLevel::ERROR])) { $this->writeError('' . $message . '', true, self::NORMAL); diff --git a/test/Crud/CrudV0Test.php b/test/Crud/CrudV0Test.php deleted file mode 100644 index a822bd1..0000000 --- a/test/Crud/CrudV0Test.php +++ /dev/null @@ -1,166 +0,0 @@ -add(new ModelCrud()); - $command = $application->find('generate-model-crud'); - $this->commandTester = new CommandTester($command); - } - - public function testCrudV0() - { - foreach (self::VARIANTS as $v) { - if (version_compare(PHP_VERSION, $v, '>=')) { - $this->path = str_replace('.', '', $v) . App::DS . self::V; - $this->checkEveryThing(); - } - } - } - - private function checkEveryThing() - { - $this->commandTester->execute([ - '--config_file' => '.jeeves.phpunit_' . self::V . '.yaml', - '--path' => self::GEN_PATH . $this->path, - ]); - $this->checkInterfaces(); - $this->checkModels(); - $this->checkRepository(); - $this->checkSearchResults(); - $this->checkGui(); - $this->checkXml('etc/di.xml'); - $this->checkXml('etc/webapi.xml'); - $this->checkXml('etc/events.xml'); - $this->checkXml('etc/module.xml'); - $this->checkFile('registration.php'); - } - - private function checkInterfaces() - { - $this->checkFile('Api/CustomerAddressRepositoryInterface.php'); - $this->checkFile('Api/Data/CustomerAddressInterface.php'); - $this->checkFile('Api/Data/CustomerAddressSearchResultsInterface.php'); - - $this->checkFile('Api/BannerRepositoryInterface.php'); - $this->checkFile('Api/Data/BannerInterface.php'); - $this->checkFile('Api/Data/BannerSearchResultsInterface.php'); - } - - private function checkModels() - { - $this->checkFile('Model/CustomerAddress.php'); - $this->checkFile('Model/ResourceModel/CustomerAddress.php'); - $this->checkFile('Model/ResourceModel/CustomerAddress/Collection.php'); - - $this->checkFile('Model/Banner.php'); - $this->checkFile('Model/ResourceModel/Banner.php'); - $this->checkFile('Model/ResourceModel/Banner/Collection.php'); - - $this->checkFile('Model/ResourceModel/Banner/Relation/Store/ReadHandler.php'); - $this->checkFile('Model/ResourceModel/Banner/Relation/Store/SaveHandler.php'); - } - - private function checkRepository() - { - $this->checkFile('Model/CustomerAddressRepository.php'); - $this->checkFile('Model/BannerRepository.php'); - $this->checkFile('Model/SearchCriteria/BannerStoreFilter.php'); - } - - private function checkSearchResults() - { - $this->checkFile('Model/BannerSearchResults.php'); - $this->checkFile('Model/CustomerAddressSearchResults.php'); - } - - private function checkGui() - { - $this->checkControllers(); - $this->checkLayout(); - $this->checkUi(); - $this->checkXml('etc/acl.xml'); - $this->checkXml('etc/adminhtml/routes.xml'); - $this->checkXml('etc/adminhtml/menu.xml'); - $this->checkXml('etc/db_schema.xml'); - } - - private function checkControllers() - { - $this->checkFile('Controller/Adminhtml/CustomerAddress.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/Delete.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/Edit.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/Index.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/InlineEdit.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/MassDelete.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/NewAction.php'); - $this->checkFile('Controller/Adminhtml/CustomerAddress/Save.php'); - - $this->checkFile('Controller/Adminhtml/Banner.php'); - $this->checkFile('Controller/Adminhtml/Banner/Index.php'); - } - - private function checkLayout() - { - $this->checkXml('view/adminhtml/layout/sample_module_customeraddress_edit.xml'); - $this->checkXml('view/adminhtml/layout/sample_module_customeraddress_index.xml'); - $this->checkXml('view/adminhtml/layout/sample_module_customeraddress_new.xml'); - - $this->checkXml('view/adminhtml/layout/sample_module_banner_index.xml'); - } - - private function checkUi() - { - $this->checkFile('Ui/Component/Listing/CustomerAddressActions.php'); - $this->checkFile('Model/CustomerAddress/DataProvider.php'); - $this->checkXml('view/adminhtml/ui_component/sample_module_customeraddress_listing.xml'); - $this->checkXml('view/adminhtml/ui_component/sample_module_customeraddress_edit.xml'); - $this->checkFile('Model/ResourceModel/CustomerAddress/Grid/Collection.php'); - - $this->checkFile('Model/Banner/DataProvider.php'); - $this->checkXml('view/adminhtml/ui_component/sample_module_banner_listing.xml'); - $this->checkFile('Model/ResourceModel/Banner/Grid/Collection.php'); - } - - private function checkFile($file) - { - $this->assertFileEquals( - 'test/Expectations/Crud/' . $this->path . '/' . $file, - self::GEN_PATH . $this->path . '/' . $file, - '', - false, - false - ); - } - - private function checkXml($file) - { - $this->assertXmlFileEqualsXmlFile( - 'test/Expectations/Crud/' . $this->path . '/' . $file, - self::GEN_PATH . $this->path . '/' . $file, - ); - $this->assertFileEquals( - 'test/Expectations/Crud/' . $this->path . '/' . $file, - self::GEN_PATH . $this->path . '/' . $file, - '', - false, - false - ); - } -} diff --git a/test/Crud/CrudV1Test.php b/test/Crud/CrudV1Test.php index 2e825c6..1af7dba 100644 --- a/test/Crud/CrudV1Test.php +++ b/test/Crud/CrudV1Test.php @@ -11,7 +11,7 @@ class CrudV1Test extends \PHPUnit\Framework\TestCase { private const GEN_PATH = App::GEN . App::DS . 'crud' . App::DS; private const V = 'v1'; - private const VARIANTS = ['7.4', '8.1', '8.2']; + private const VARIANTS = ['8.1', '8.2', '8.3']; private CommandTester $commandTester; private string $path; diff --git a/test/Expectations/Crud/74/v0/Api/BannerRepositoryInterface.php b/test/Expectations/Crud/74/v0/Api/BannerRepositoryInterface.php deleted file mode 100644 index 3edf1a4..0000000 --- a/test/Expectations/Crud/74/v0/Api/BannerRepositoryInterface.php +++ /dev/null @@ -1,50 +0,0 @@ -repository = $repository; - $this->coreRegistry = $coreRegistry; - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/Banner/Index.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/Banner/Index.php deleted file mode 100644 index 71fe94a..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/Banner/Index.php +++ /dev/null @@ -1,51 +0,0 @@ -resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; - } - - /** - * Index action - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ - $resultPage = $this->resultPageFactory->create(); - $resultPage - ->setActiveMenu('Mygento_SampleModule::banner') - ->getConfig() - ->getTitle()->prepend(__('Banner')->render()); - - $this->dataPersistor->clear('sample_module_banner'); - - return $resultPage; - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress.php deleted file mode 100644 index 7a252db..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress.php +++ /dev/null @@ -1,43 +0,0 @@ -repository = $repository; - $this->coreRegistry = $coreRegistry; - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Delete.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Delete.php deleted file mode 100644 index 632845c..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Delete.php +++ /dev/null @@ -1,38 +0,0 @@ -resultRedirectFactory->create(); - $entityId = (int) $this->getRequest()->getParam('id'); - if (!$entityId) { - $this->messageManager->addErrorMessage( - __('We can not find a Customer Address to delete.')->render() - ); - - return $resultRedirect->setPath('*/*/'); - } - - try { - $this->repository->deleteById($entityId); - $this->messageManager->addSuccessMessage( - __('You deleted the Customer Address')->render() - ); - - return $resultRedirect->setPath('*/*/'); - } catch (\Exception $e) { - $this->messageManager->addErrorMessage($e->getMessage()); - } - - return $resultRedirect->setPath('*/*/edit', ['id' => $entityId]); - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Edit.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Edit.php deleted file mode 100644 index 2d1c4de..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Edit.php +++ /dev/null @@ -1,73 +0,0 @@ -entityFactory = $entityFactory; - $this->resultPageFactory = $resultPageFactory; - } - - /** - * Edit Customer Address action - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - $entityId = (int) $this->getRequest()->getParam('id'); - $entity = $this->entityFactory->create(); - if ($entityId) { - try { - $entity = $this->repository->getById($entityId); - } catch (NoSuchEntityException $e) { - $this->messageManager->addErrorMessage( - __('This Customer Address no longer exists')->render() - ); - /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ - $resultRedirect = $this->resultRedirectFactory->create(); - - return $resultRedirect->setPath('*/*/'); - } - } - $this->coreRegistry->register('sample_module_customeraddress', $entity); - - /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ - $resultPage = $this->resultPageFactory->create(); - $resultPage->setActiveMenu('Mygento_SampleModule::customeraddress'); - $resultPage->addBreadcrumb( - $entityId ? __('Edit Customer Address')->render() : __('New Customer Address')->render(), - $entityId ? __('Edit Customer Address')->render() : __('New Customer Address')->render() - ); - $resultPage->getConfig()->getTitle()->prepend(__('Customer Address')->render()); - $resultPage->getConfig()->getTitle()->prepend( - $entityId ? $entity->getTitle() : __('New Customer Address')->render() - ); - - return $resultPage; - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Index.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Index.php deleted file mode 100644 index b734532..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Index.php +++ /dev/null @@ -1,51 +0,0 @@ -resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; - } - - /** - * Index action - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ - $resultPage = $this->resultPageFactory->create(); - $resultPage - ->setActiveMenu('Mygento_SampleModule::customeraddress') - ->getConfig() - ->getTitle()->prepend(__('Customer Address')->render()); - - $this->dataPersistor->clear('sample_module_customeraddress'); - - return $resultPage; - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/InlineEdit.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/InlineEdit.php deleted file mode 100644 index 39dc7cf..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/InlineEdit.php +++ /dev/null @@ -1,70 +0,0 @@ -jsonFactory = $jsonFactory; - } - - /** - * Execute action - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - /** @var \Magento\Framework\Controller\Result\Json $resultJson */ - $resultJson = $this->jsonFactory->create(); - $error = false; - $messages = []; - - $postItems = $this->getRequest()->getParam('items', []); - if (!($this->getRequest()->getParam('isAjax') && count($postItems))) { - return $resultJson->setData([ - 'messages' => [__('Please correct the data sent.')->render()], - 'error' => true, - ]); - } - - foreach (array_keys($postItems) as $id) { - try { - $entity = $this->repository->getById($id); - $entity->setData(array_merge($entity->getData(), $postItems[$id])); - $this->repository->save($entity); - } catch (NoSuchEntityException $e) { - $messages[] = $id . ' -> ' . __('Not found')->render(); - $error = true; - continue; - } catch (\Exception $e) { - $messages[] = __($e->getMessage()); - $error = true; - continue; - } - } - - return $resultJson->setData([ - 'messages' => $messages, - 'error' => $error, - ]); - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/MassDelete.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/MassDelete.php deleted file mode 100644 index 069548b..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/MassDelete.php +++ /dev/null @@ -1,55 +0,0 @@ -filter = $filter; - $this->collectionFactory = $collectionFactory; - parent::__construct($repository, $coreRegistry, $context); - } - - /** - * Execute action - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - $collection = $this->filter->getCollection($this->collectionFactory->create()); - $collectionSize = $collection->getSize(); - - foreach ($collection as $entity) { - $this->repository->delete($entity); - } - $this->messageManager->addSuccessMessage( - __('A total of %1 record(s) have been deleted.', $collectionSize)->render() - ); - /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ - $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); - - return $resultRedirect->setPath('*/*/'); - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/NewAction.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/NewAction.php deleted file mode 100644 index d00348d..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/NewAction.php +++ /dev/null @@ -1,39 +0,0 @@ -resultForwardFactory = $resultForwardFactory; - } - - /** - * Create new Customer Address - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ - $resultForward = $this->resultForwardFactory->create(); - - return $resultForward->forward('edit'); - } -} diff --git a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Save.php b/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Save.php deleted file mode 100644 index 48b22a0..0000000 --- a/test/Expectations/Crud/74/v0/Controller/Adminhtml/CustomerAddress/Save.php +++ /dev/null @@ -1,95 +0,0 @@ -dataPersistor = $dataPersistor; - $this->entityFactory = $entityFactory; - } - - /** - * Save Customer Address action - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * - * @return \Magento\Framework\Controller\ResultInterface - */ - public function execute() - { - /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ - $resultRedirect = $this->resultRedirectFactory->create(); - $data = $this->getRequest()->getPostValue(); - if (!$data) { - return $resultRedirect->setPath('*/*/'); - } - $entityId = (int) $this->getRequest()->getParam('id'); - $entity = $this->entityFactory->create(); - if ($entityId) { - try { - $entity = $this->repository->getById($entityId); - } catch (NoSuchEntityException $e) { - if (!$entity->getId()) { - $this->messageManager->addErrorMessage( - __('This Customer Address no longer exists')->render() - ); - - return $resultRedirect->setPath('*/*/'); - } - } - } - if (empty($data['id'])) { - $data['id'] = null; - } - $entity->setData($data); - - try { - $this->repository->save($entity); - $this->messageManager->addSuccessMessage( - __('You saved the Customer Address')->render() - ); - $this->dataPersistor->clear('sample_module_customeraddress'); - if ($this->getRequest()->getParam('back')) { - return $resultRedirect->setPath('*/*/edit', ['id' => $entity->getId()]); - } - - return $resultRedirect->setPath('*/*/'); - } catch (LocalizedException $e) { - $this->messageManager->addErrorMessage($e->getMessage()); - } catch (\Exception $e) { - $this->messageManager->addExceptionMessage( - $e, - __('Something went wrong while saving the Customer Address')->render() - ); - } - $this->dataPersistor->set('sample_module_customeraddress', $data); - - return $resultRedirect->setPath('*/*/edit', ['id' => $this->getRequest()->getParam('id')]); - } -} diff --git a/test/Expectations/Crud/74/v0/Helper/Data.php b/test/Expectations/Crud/74/v0/Helper/Data.php deleted file mode 100644 index d21c9b0..0000000 --- a/test/Expectations/Crud/74/v0/Helper/Data.php +++ /dev/null @@ -1,9 +0,0 @@ -getId()]; - } - - /** - * Get id - * @return int|null - */ - public function getId() - { - return $this->getData(self::ID); - } - - /** - * Set id - * @param int $id - * @return $this - */ - public function setId($id) - { - return $this->setData(self::ID, $id); - } - - /** - * Get name - * @return string|null - */ - public function getName() - { - return $this->getData(self::NAME); - } - - /** - * Set name - * @param string $name - * @return $this - */ - public function setName($name) - { - return $this->setData(self::NAME, $name); - } - - /** - * Get subname - * @return string|null - */ - public function getSubname() - { - return $this->getData(self::SUBNAME); - } - - /** - * Set subname - * @param string $subname - * @return $this - */ - public function setSubname($subname) - { - return $this->setData(self::SUBNAME, $subname); - } - - /** - * Get family - * @return string|null - */ - public function getFamily() - { - return $this->getData(self::FAMILY); - } - - /** - * Set family - * @param string $family - * @return $this - */ - public function setFamily($family) - { - return $this->setData(self::FAMILY, $family); - } - - /** - * Get is active - * @return bool - */ - public function getIsActive() - { - return $this->getData(self::IS_ACTIVE); - } - - /** - * Set is active - * @param bool $isActive - * @return $this - */ - public function setIsActive($isActive) - { - return $this->setData(self::IS_ACTIVE, $isActive); - } - - /** - * Get product id - * @return int|null - */ - public function getProductId() - { - return $this->getData(self::PRODUCT_ID); - } - - /** - * Set product id - * @param int $productId - * @return $this - */ - public function setProductId($productId) - { - return $this->setData(self::PRODUCT_ID, $productId); - } - - /** - * Get store id - * @return array|null - */ - public function getStoreId() - { - return $this->getData(self::STORE_ID); - } - - /** - * Set store id - * @param array $storeId - * @return $this - */ - public function setStoreId($storeId) - { - return $this->setData(self::STORE_ID, $storeId); - } - - /** - * @return void - */ - protected function _construct() - { - $this->_init(ResourceModel\Banner::class); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/Banner/DataProvider.php b/test/Expectations/Crud/74/v0/Model/Banner/DataProvider.php deleted file mode 100644 index dba906a..0000000 --- a/test/Expectations/Crud/74/v0/Model/Banner/DataProvider.php +++ /dev/null @@ -1,68 +0,0 @@ -collection = $collectionFactory->create(); - $this->dataPersistor = $dataPersistor; - } - - /** - * @return array - */ - public function getData() - { - if (!empty($this->loadedData)) { - return $this->loadedData; - } - $items = $this->collection->getItems(); - foreach ($items as $model) { - $this->loadedData[$model->getId()] = $model->getData(); - } - $data = $this->dataPersistor->get('sample_module_banner'); - if (!empty($data)) { - $model = $this->collection->getNewEmptyItem(); - $model->setData($data); - $this->loadedData[$model->getId()] = $model->getData(); - $this->dataPersistor->clear('sample_module_banner'); - } - - return $this->loadedData; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/BannerRepository.php b/test/Expectations/Crud/74/v0/Model/BannerRepository.php deleted file mode 100644 index e528920..0000000 --- a/test/Expectations/Crud/74/v0/Model/BannerRepository.php +++ /dev/null @@ -1,147 +0,0 @@ -resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; - $this->storeManager = $storeManager; - } - - /** - * @param int $entityId - * @throws \Magento\Framework\Exception\NoSuchEntityException - * @return \Mygento\SampleModule\Api\Data\BannerInterface - */ - public function getById($entityId) - { - $entity = $this->entityFactory->create(); - $this->resource->load($entity, $entityId); - if (!$entity->getId()) { - throw new NoSuchEntityException( - __('A Sample Module Banner with id "%1" does not exist', $entityId) - ); - } - - return $entity; - } - - /** - * @param \Mygento\SampleModule\Api\Data\BannerInterface $entity - * @throws \Magento\Framework\Exception\CouldNotSaveException - * @return \Mygento\SampleModule\Api\Data\BannerInterface - */ - public function save(\Mygento\SampleModule\Api\Data\BannerInterface $entity) - { - if (empty($entity->getStoreId())) { - $entity->setStoreId([$this->storeManager->getStore()->getId()]); - } - - try { - $this->resource->save($entity); - } catch (\Exception $exception) { - throw new CouldNotSaveException( - __('Could not save the Sample Module Banner'), - $exception - ); - } - - return $entity; - } - - /** - * @param \Mygento\SampleModule\Api\Data\BannerInterface $entity - * @throws \Magento\Framework\Exception\CouldNotDeleteException - * @return bool - */ - public function delete(\Mygento\SampleModule\Api\Data\BannerInterface $entity) - { - try { - $this->resource->delete($entity); - } catch (\Exception $exception) { - throw new CouldNotDeleteException( - __($exception->getMessage()) - ); - } - - return true; - } - - /** - * @param int $entityId - * @throws \Magento\Framework\Exception\NoSuchEntityException - * @throws \Magento\Framework\Exception\CouldNotDeleteException - * @return bool - */ - public function deleteById($entityId) - { - return $this->delete($this->getById($entityId)); - } - - /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria - * @return \Mygento\SampleModule\Api\Data\BannerSearchResultsInterface - */ - public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria) - { - /** @var \Mygento\SampleModule\Model\ResourceModel\Banner\Collection $collection */ - $collection = $this->collectionFactory->create(); - - $this->collectionProcessor->process($criteria, $collection); - - /** @var \Mygento\SampleModule\Api\Data\BannerSearchResultsInterface $searchResults */ - $searchResults = $this->searchResultsFactory->create(); - $searchResults->setSearchCriteria($criteria); - $searchResults->setItems($collection->getItems()); - $searchResults->setTotalCount($collection->getSize()); - - return $searchResults; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/BannerSearchResults.php b/test/Expectations/Crud/74/v0/Model/BannerSearchResults.php deleted file mode 100644 index 5299848..0000000 --- a/test/Expectations/Crud/74/v0/Model/BannerSearchResults.php +++ /dev/null @@ -1,10 +0,0 @@ -service = $service; - parent::__construct( - $helper, - $carrier, - $scopeConfig, - $rateErrorFactory, - $logger, - $data - ); - } - - /** - * @param \Magento\Quote\Model\Quote\Address\RateRequest $request - * @return bool|\Magento\Framework\DataObject|null - * @api - */ - public function collectRates(RateRequest $request) - { - \Magento\Framework\Profiler::start($this->code . '_collect_rate'); - - //Validation - $valid = $this->validateRequest($request); - if ($valid !== true) { - return $valid; - } - - $data = [ - 'city' => $this->convertCity($request), - 'weight' => $this->convertWeight($request), - 'order_sum' => round($this->getCartTotal(), 0), - 'postcode' => $this->getPostCode($request), - ]; - - $response = $this->service->calculateDeliveryCost($data); - $result = $this->carrier->getResult(); - foreach ($response as $delivery) { - $method = [ - 'code' => $this->code, - 'title' => $this->helper->getConfig('title'), - 'method' => $this->code, - 'name' => $this->code, - 'price' => $request->getFreeShipping() ? 0 : $delivery['cost'], - 'cost' => $request->getFreeShipping() ? 0 : $delivery['cost'], - 'estimate_dates' => [], - ]; - - $rate = $this->createRateMethod($method); - $result->append($rate); - } - - \Magento\Framework\Profiler::stop($this->code . '_collect_rate'); - - return $result; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/Client.php b/test/Expectations/Crud/74/v0/Model/Client.php deleted file mode 100644 index ab2a37d..0000000 --- a/test/Expectations/Crud/74/v0/Model/Client.php +++ /dev/null @@ -1,19 +0,0 @@ -helper = $helper; - parent::__construct($client); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/CustomerAddress.php b/test/Expectations/Crud/74/v0/Model/CustomerAddress.php deleted file mode 100644 index f4f46c1..0000000 --- a/test/Expectations/Crud/74/v0/Model/CustomerAddress.php +++ /dev/null @@ -1,161 +0,0 @@ -getId()]; - } - - /** - * Get id - * @return int|null - */ - public function getId() - { - return $this->getData(self::ID); - } - - /** - * Set id - * @param int $id - * @return $this - */ - public function setId($id) - { - return $this->setData(self::ID, $id); - } - - /** - * Get city - * @return string - */ - public function getCity() - { - return $this->getData(self::CITY); - } - - /** - * Set city - * @param string $city - * @return $this - */ - public function setCity($city) - { - return $this->setData(self::CITY, $city); - } - - /** - * Get customer group - * @return int - */ - public function getCustomerGroup() - { - return $this->getData(self::CUSTOMER_GROUP); - } - - /** - * Set customer group - * @param int $customerGroup - * @return $this - */ - public function setCustomerGroup($customerGroup) - { - return $this->setData(self::CUSTOMER_GROUP, $customerGroup); - } - - /** - * Get created at - * @return string - */ - public function getCreatedAt() - { - return $this->getData(self::CREATED_AT); - } - - /** - * Set created at - * @param string $createdAt - * @return $this - */ - public function setCreatedAt($createdAt) - { - return $this->setData(self::CREATED_AT, $createdAt); - } - - /** - * Get updated at - * @return string - */ - public function getUpdatedAt() - { - return $this->getData(self::UPDATED_AT); - } - - /** - * Set updated at - * @param string $updatedAt - * @return $this - */ - public function setUpdatedAt($updatedAt) - { - return $this->setData(self::UPDATED_AT, $updatedAt); - } - - /** - * Get discount - * @return float|null - */ - public function getDiscount() - { - return $this->getData(self::DISCOUNT); - } - - /** - * Set discount - * @param float $discount - * @return $this - */ - public function setDiscount($discount) - { - return $this->setData(self::DISCOUNT, $discount); - } - - /** - * Get price - * @return float|null - */ - public function getPrice() - { - return $this->getData(self::PRICE); - } - - /** - * Set price - * @param float $price - * @return $this - */ - public function setPrice($price) - { - return $this->setData(self::PRICE, $price); - } - - /** - * @return void - */ - protected function _construct() - { - $this->_init(ResourceModel\CustomerAddress::class); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/CustomerAddress/DataProvider.php b/test/Expectations/Crud/74/v0/Model/CustomerAddress/DataProvider.php deleted file mode 100644 index 705e84c..0000000 --- a/test/Expectations/Crud/74/v0/Model/CustomerAddress/DataProvider.php +++ /dev/null @@ -1,68 +0,0 @@ -collection = $collectionFactory->create(); - $this->dataPersistor = $dataPersistor; - } - - /** - * @return array - */ - public function getData() - { - if (!empty($this->loadedData)) { - return $this->loadedData; - } - $items = $this->collection->getItems(); - foreach ($items as $model) { - $this->loadedData[$model->getId()] = $model->getData(); - } - $data = $this->dataPersistor->get('sample_module_customeraddress'); - if (!empty($data)) { - $model = $this->collection->getNewEmptyItem(); - $model->setData($data); - $this->loadedData[$model->getId()] = $model->getData(); - $this->dataPersistor->clear('sample_module_customeraddress'); - } - - return $this->loadedData; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/CustomerAddressRepository.php b/test/Expectations/Crud/74/v0/Model/CustomerAddressRepository.php deleted file mode 100644 index b20224f..0000000 --- a/test/Expectations/Crud/74/v0/Model/CustomerAddressRepository.php +++ /dev/null @@ -1,136 +0,0 @@ -resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; - } - - /** - * @param int $entityId - * @throws \Magento\Framework\Exception\NoSuchEntityException - * @return \Mygento\SampleModule\Api\Data\CustomerAddressInterface - */ - public function getById($entityId) - { - $entity = $this->entityFactory->create(); - $this->resource->load($entity, $entityId); - if (!$entity->getId()) { - throw new NoSuchEntityException( - __('A Sample Module Customer Address with id "%1" does not exist', $entityId) - ); - } - - return $entity; - } - - /** - * @param \Mygento\SampleModule\Api\Data\CustomerAddressInterface $entity - * @throws \Magento\Framework\Exception\CouldNotSaveException - * @return \Mygento\SampleModule\Api\Data\CustomerAddressInterface - */ - public function save(\Mygento\SampleModule\Api\Data\CustomerAddressInterface $entity) - { - try { - $this->resource->save($entity); - } catch (\Exception $exception) { - throw new CouldNotSaveException( - __('Could not save the Sample Module Customer Address'), - $exception - ); - } - - return $entity; - } - - /** - * @param \Mygento\SampleModule\Api\Data\CustomerAddressInterface $entity - * @throws \Magento\Framework\Exception\CouldNotDeleteException - * @return bool - */ - public function delete(\Mygento\SampleModule\Api\Data\CustomerAddressInterface $entity) - { - try { - $this->resource->delete($entity); - } catch (\Exception $exception) { - throw new CouldNotDeleteException( - __($exception->getMessage()) - ); - } - - return true; - } - - /** - * @param int $entityId - * @throws \Magento\Framework\Exception\NoSuchEntityException - * @throws \Magento\Framework\Exception\CouldNotDeleteException - * @return bool - */ - public function deleteById($entityId) - { - return $this->delete($this->getById($entityId)); - } - - /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria - * @return \Mygento\SampleModule\Api\Data\CustomerAddressSearchResultsInterface - */ - public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria) - { - /** @var \Mygento\SampleModule\Model\ResourceModel\CustomerAddress\Collection $collection */ - $collection = $this->collectionFactory->create(); - - $this->collectionProcessor->process($criteria, $collection); - - /** @var \Mygento\SampleModule\Api\Data\CustomerAddressSearchResultsInterface $searchResults */ - $searchResults = $this->searchResultsFactory->create(); - $searchResults->setSearchCriteria($criteria); - $searchResults->setItems($collection->getItems()); - $searchResults->setTotalCount($collection->getSize()); - - return $searchResults; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/CustomerAddressSearchResults.php b/test/Expectations/Crud/74/v0/Model/CustomerAddressSearchResults.php deleted file mode 100644 index 7235fa3..0000000 --- a/test/Expectations/Crud/74/v0/Model/CustomerAddressSearchResults.php +++ /dev/null @@ -1,10 +0,0 @@ -entityManager = $entityManager; - $this->metadataPool = $metadataPool; - } - - /** - * @inheritDoc - */ - public function getConnection() - { - return $this->metadataPool->getMetadata(BannerInterface::class)->getEntityConnection(); - } - - /** - * @inheritDoc - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function load(AbstractModel $object, $value, $field = null) - { - return $this->entityManager->load($object, $value); - } - - /** - * @inheritDoc - */ - public function save(AbstractModel $object) - { - $this->entityManager->save($object); - - return $this; - } - - /** - * @inheritDoc - */ - public function delete(AbstractModel $object) - { - $this->entityManager->delete($object); - - return $this; - } - - /** - * Find store ids to which specified item is assigned - * - * @param int $id - * @return array - */ - public function lookupStoreIds($id) - { - $connection = $this->getConnection(); - - $entityMetadata = $this->metadataPool->getMetadata(BannerInterface::class); - $linkField = $entityMetadata->getLinkField(); - - $select = $connection->select() - ->from(['es' => $this->getMainTable() . '_store'], 'store_id') - ->join( - ['e' => $this->getMainTable()], - 'es.entity_id = e.' . $linkField, - [] - ) - ->where('e.' . $entityMetadata->getIdentifierField() . ' = :entity_id'); - - return $connection->fetchCol($select, ['entity_id' => (int) $id]); - } - - /** - * Initialize resource model - * @return void - */ - protected function _construct() - { - $this->_init(self::TABLE_NAME, self::TABLE_PRIMARY_KEY); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Collection.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Collection.php deleted file mode 100644 index bf87662..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Collection.php +++ /dev/null @@ -1,106 +0,0 @@ -metadataPool = $metadataPool; - } - - /** - * Define resource model - */ - protected function _construct() - { - $this->_init( - \Mygento\SampleModule\Model\Banner::class, - \Mygento\SampleModule\Model\ResourceModel\Banner::class - ); - } - - protected function _afterLoad() - { - $entityMetadata = $this->metadataPool->getMetadata(BannerInterface::class); - $linkedIds = $this->getColumnValues($entityMetadata->getLinkField()); - - if (!count($linkedIds)) { - return parent::_afterLoad(); - } - - $connection = $this->getConnection(); - $select = $connection->select()->from( - ['entity_store' => $this->getTable($this->getMainTable() . '_store')] - )->where('entity_store.entity_id IN (?)', $linkedIds); - - $result = $connection->fetchAll($select); - if (!$result) { - return parent::_afterLoad(); - } - - $stores = []; - foreach ($result as $r) { - $stores[] = $r['store_id']; - } - - foreach ($this as $item) { - $item->setData('store_id', $stores); - } - - return parent::_afterLoad(); - } - - protected function _renderFiltersBefore() - { - if (!$this->getFilter('store_id')) { - parent::_renderFiltersBefore(); - - return; - } - - $entityMetadata = $this->metadataPool->getMetadata(BannerInterface::class); - $linkField = $entityMetadata->getLinkField(); - - $this->getSelect()->join( - ['store_table' => $this->getMainTable() . '_store'], - 'main_table.' . $linkField . ' = store_table.entity_id', - [] - )->group('main_table.' . $linkField); - - parent::_renderFiltersBefore(); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Grid/Collection.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Grid/Collection.php deleted file mode 100644 index f92b72c..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Grid/Collection.php +++ /dev/null @@ -1,122 +0,0 @@ -_eventPrefix = $eventPrefix; - $this->_eventObject = $eventObject; - $this->_init($model, $resourceModel); - $this->setMainTable($mainTable); - } - - /** - * @return \Magento\Framework\Api\Search\AggregationInterface - */ - public function getAggregations() - { - return $this->aggregations; - } - - /** - * @param \Magento\Framework\Api\Search\AggregationInterface $aggregations - * @return $this - */ - public function setAggregations($aggregations) - { - $this->aggregations = $aggregations; - - return $this; - } - - /** - * @return \Magento\Framework\Api\SearchCriteriaInterface|null - */ - public function getSearchCriteria() - { - return null; - } - - /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null) - { - return $this; - } - - /** - * @return int - */ - public function getTotalCount() - { - return $this->getSize(); - } - - /** - * @param int $totalCount - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setTotalCount($totalCount) - { - return $this; - } - - /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setItems(array $items = null) - { - return $this; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/ReadHandler.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/ReadHandler.php deleted file mode 100644 index 730c1b9..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/ReadHandler.php +++ /dev/null @@ -1,30 +0,0 @@ -resource = $resource; - } - - /** - * @inheritDoc - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function execute($entity, $arguments = []) - { - if ($entity->getId()) { - $stores = $this->resource->lookupStoreIds((int) $entity->getId()); - $entity->setData(BannerInterface::STORE_ID, $stores); - } - - return $entity; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/SaveHandler.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/SaveHandler.php deleted file mode 100644 index 09898fe..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/Banner/Relation/Store/SaveHandler.php +++ /dev/null @@ -1,59 +0,0 @@ -resource = $resource; - $this->metadataPool = $metadataPool; - } - - /** - * @inheritDoc - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function execute($entity, $arguments = []) - { - $entityMetadata = $this->metadataPool->getMetadata(BannerInterface::class); - $linkField = $entityMetadata->getLinkField(); - $connection = $entityMetadata->getEntityConnection(); - $oldStores = $this->resource->lookupStoreIds((int) $entity->getId()); - $newStores = (array) $entity->getStoreId(); - $table = $this->resource->getTable($entityMetadata->getEntityTable() . '_store'); - - $delete = array_diff($oldStores, $newStores); - if ($delete) { - $where = [ - 'entity_id = ?' => (int) $entity->getData($linkField), - 'store_id IN (?)' => $delete, - ]; - $connection->delete($table, $where); - } - - $insert = array_diff($newStores, $oldStores); - if ($insert) { - $data = []; - foreach ($insert as $storeId) { - $data[] = [ - 'entity_id' => (int) $entity->getData($linkField), - 'store_id' => (int) $storeId, - ]; - } - $connection->insertMultiple($table, $data); - } - - return $entity; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress.php deleted file mode 100644 index bf9df85..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress.php +++ /dev/null @@ -1,18 +0,0 @@ -_init(self::TABLE_NAME, self::TABLE_PRIMARY_KEY); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Collection.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Collection.php deleted file mode 100644 index 1e739f5..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Collection.php +++ /dev/null @@ -1,20 +0,0 @@ -_init( - \Mygento\SampleModule\Model\CustomerAddress::class, - \Mygento\SampleModule\Model\ResourceModel\CustomerAddress::class - ); - } -} diff --git a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Grid/Collection.php b/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Grid/Collection.php deleted file mode 100644 index 3834630..0000000 --- a/test/Expectations/Crud/74/v0/Model/ResourceModel/CustomerAddress/Grid/Collection.php +++ /dev/null @@ -1,119 +0,0 @@ -_eventPrefix = $eventPrefix; - $this->_eventObject = $eventObject; - $this->_init($model, $resourceModel); - $this->setMainTable($mainTable); - } - - /** - * @return \Magento\Framework\Api\Search\AggregationInterface - */ - public function getAggregations() - { - return $this->aggregations; - } - - /** - * @param \Magento\Framework\Api\Search\AggregationInterface $aggregations - * @return $this - */ - public function setAggregations($aggregations) - { - $this->aggregations = $aggregations; - - return $this; - } - - /** - * @return \Magento\Framework\Api\SearchCriteriaInterface|null - */ - public function getSearchCriteria() - { - return null; - } - - /** - * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null) - { - return $this; - } - - /** - * @return int - */ - public function getTotalCount() - { - return $this->getSize(); - } - - /** - * @param int $totalCount - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setTotalCount($totalCount) - { - return $this; - } - - /** - * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setItems(array $items = null) - { - return $this; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/SearchCriteria/BannerStoreFilter.php b/test/Expectations/Crud/74/v0/Model/SearchCriteria/BannerStoreFilter.php deleted file mode 100644 index 6324283..0000000 --- a/test/Expectations/Crud/74/v0/Model/SearchCriteria/BannerStoreFilter.php +++ /dev/null @@ -1,24 +0,0 @@ -addFilter( - BannerInterface::STORE_ID, - ['in' => $filter->getValue()] - ); - - return true; - } -} diff --git a/test/Expectations/Crud/74/v0/Model/Service.php b/test/Expectations/Crud/74/v0/Model/Service.php deleted file mode 100644 index d9011c7..0000000 --- a/test/Expectations/Crud/74/v0/Model/Service.php +++ /dev/null @@ -1,43 +0,0 @@ -client = $client; - parent::__construct($service); - } - - /** - * @param array $params - * @return array - */ - public function calculateDeliveryCost(array $params): array - { - return []; - } - - /** - * @param \Magento\Sales\Model\Order $order - * @param array $data - */ - public function orderCreate(\Magento\Sales\Model\Order $order, array $data = []) - { - } - - /** - * @param int|string $orderId - */ - public function orderCancel($orderId) - { - } -} diff --git a/test/Expectations/Crud/74/v0/Ui/Component/Listing/CustomerAddressActions.php b/test/Expectations/Crud/74/v0/Ui/Component/Listing/CustomerAddressActions.php deleted file mode 100644 index 7639c16..0000000 --- a/test/Expectations/Crud/74/v0/Ui/Component/Listing/CustomerAddressActions.php +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/etc/adminhtml/menu.xml b/test/Expectations/Crud/74/v0/etc/adminhtml/menu.xml deleted file mode 100644 index abcbed9..0000000 --- a/test/Expectations/Crud/74/v0/etc/adminhtml/menu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/etc/adminhtml/routes.xml b/test/Expectations/Crud/74/v0/etc/adminhtml/routes.xml deleted file mode 100644 index d27f5a6..0000000 --- a/test/Expectations/Crud/74/v0/etc/adminhtml/routes.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/etc/db_schema.xml b/test/Expectations/Crud/74/v0/etc/db_schema.xml deleted file mode 100644 index 0003240..0000000 --- a/test/Expectations/Crud/74/v0/etc/db_schema.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- diff --git a/test/Expectations/Crud/74/v0/etc/di.xml b/test/Expectations/Crud/74/v0/etc/di.xml deleted file mode 100644 index 8cd820a..0000000 --- a/test/Expectations/Crud/74/v0/etc/di.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - Mygento\SampleModule\Api\CustomerAddressRepositoryInterface - Mygento\SampleModule\Api\BannerRepositoryInterface - - - - - - - Mygento\SampleModule\Model\SearchCriteria\BannerStoreFilter - - - - - - - Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\PaginationProcessor - - - - - - - Mygento\SampleModule\Model\SearchCriteria\BannerFilterProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\PaginationProcessor - - - - - - Mygento\SampleModule\Model\SearchCriteria\CustomerAddressCollectionProcessor - - - - - Mygento\SampleModule\Model\SearchCriteria\BannerCollectionProcessor - - - - - - - mygento_sample_module_banner - id - - - - - - - - - - Mygento\SampleModule\Model\ResourceModel\Banner\Relation\Store\ReadHandler - - - Mygento\SampleModule\Model\ResourceModel\Banner\Relation\Store\SaveHandler - - - Mygento\SampleModule\Model\ResourceModel\Banner\Relation\Store\SaveHandler - - - - - - - - - Magento\Framework\EntityManager\AbstractModelHydrator - - - - - - - Mygento\SampleModule\Model\ResourceModel\CustomerAddress\Grid\Collection - Mygento\SampleModule\Model\ResourceModel\Banner\Grid\Collection - - - - - - mygento_sample_custom_table_name - sample_module_customeraddress_grid_collection - customer_address_grid_collection - Mygento\SampleModule\Model\ResourceModel\CustomerAddress - - - - - mygento_sample_module_banner - sample_module_banner_grid_collection - banner_grid_collection - Mygento\SampleModule\Model\ResourceModel\Banner - - - diff --git a/test/Expectations/Crud/74/v0/etc/events.xml b/test/Expectations/Crud/74/v0/etc/events.xml deleted file mode 100644 index ca92a10..0000000 --- a/test/Expectations/Crud/74/v0/etc/events.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/etc/webapi.xml b/test/Expectations/Crud/74/v0/etc/webapi.xml deleted file mode 100644 index 7f53e09..0000000 --- a/test/Expectations/Crud/74/v0/etc/webapi.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_banner_index.xml b/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_banner_index.xml deleted file mode 100644 index 8da1708..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_banner_index.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_edit.xml b/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_edit.xml deleted file mode 100644 index f7a88d8..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_edit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_index.xml b/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_index.xml deleted file mode 100644 index 7618d0f..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_index.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_new.xml b/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_new.xml deleted file mode 100644 index 042f577..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/layout/sample_module_customeraddress_new.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_banner_listing.xml b/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_banner_listing.xml deleted file mode 100644 index ef26c13..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_banner_listing.xml +++ /dev/null @@ -1,123 +0,0 @@ - -- - - sample_module_banner_listing.sample_module_banner_listing_data_source - - - - - sample_module_banner_columns - - sample_module_banner_listing.sample_module_banner_listing_data_source - - - - - - id - - - - Mygento_SampleModule::banner - - - id - id - - - - - - 1 - - - - - - - - - - - - - - - - - - - textRange - text - - asc - - - - - text - text - - text - - - - - - - text - text - - text - - - - - - - text - text - - text - - - - - - - select - select - - select - - - - - - - - textRange - text - - text - - true - true - - - - - - - - - ui/grid/cells/html - false - - - - diff --git a/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_customeraddress_edit.xml b/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_customeraddress_edit.xml deleted file mode 100644 index d27ec14..0000000 --- a/test/Expectations/Crud/74/v0/view/adminhtml/ui_component/sample_module_customeraddress_edit.xml +++ /dev/null @@ -1,151 +0,0 @@ - -
- - - sample_module_customeraddress_edit.sample_module_customeraddress_edit_data_source - - General Information - templates/form/collapsible - - - - - - sample_module_customeraddress_columns - - sample_module_customeraddress_listing.sample_module_customeraddress_listing_data_source - -
- - - - id - - - - Mygento_SampleModule::customeraddress - - - id - id - - - - - - 1 - - - - - - - - - - - - - - - - - - Are you sure you want to delete selected items? - Delete items - - - delete - - - - - - - editSelected - sample_module_customeraddress_listing.sample_module_customeraddress_listing.sample_module_customeraddress_columns_editor - - edit - - - - - - - - - - - - false - - id - true - sample_module_customeraddress_listing.sample_module_customeraddress_listing.sample_module_customeraddress_columns.ids - - - - sample_module_customeraddress_listing.sample_module_customeraddress_listing.sample_module_customeraddress_columns_editor - startEdit - - ${ $.$data.rowIndex } - true - - - - - - - id - - - - - textRange - text - - asc - - - - - text - text - - text - - true - - - - - - - - select - select - - select - - true - true - - - - - - - - - dateRange - date - - - - - - dateRange - date - - - - - - text - text - - text - - - - - - - textRange - text - - text - - - - - - - id - - - - diff --git a/test/Expectations/Crud/74/v1/Api/Data/TicketInterface.php b/test/Expectations/Crud/74/v1/Api/Data/TicketInterface.php deleted file mode 100644 index 1326fa3..0000000 --- a/test/Expectations/Crud/74/v1/Api/Data/TicketInterface.php +++ /dev/null @@ -1,51 +0,0 @@ -_init(self::TABLE_NAME, self::TABLE_PRIMARY_KEY); - } -} diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Ticket/Collection.php b/test/Expectations/Crud/74/v1/Model/ResourceModel/Ticket/Collection.php deleted file mode 100644 index 8c6b08d..0000000 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Ticket/Collection.php +++ /dev/null @@ -1,24 +0,0 @@ -_init( - Ticket::class, - TicketResource::class - ); - } -} diff --git a/test/Expectations/Crud/74/v1/Model/Ticket.php b/test/Expectations/Crud/74/v1/Model/Ticket.php deleted file mode 100644 index 0c6851c..0000000 --- a/test/Expectations/Crud/74/v1/Model/Ticket.php +++ /dev/null @@ -1,85 +0,0 @@ -getData(self::TICKET_ID); - } - - /** - * Set ticket id - */ - public function setTicketId(?int $ticketId): self - { - return $this->setData(self::TICKET_ID, $ticketId); - } - - /** - * Get name - */ - public function getName(): ?string - { - return $this->getData(self::NAME); - } - - /** - * Set name - */ - public function setName(?string $name): self - { - return $this->setData(self::NAME, $name); - } - - /** - * Get is active - */ - public function getIsActive(): bool - { - return $this->getData(self::IS_ACTIVE); - } - - /** - * Set is active - */ - public function setIsActive(bool $isActive): self - { - return $this->setData(self::IS_ACTIVE, $isActive); - } - - /** - * Get ID - */ - public function getId(): ?int - { - return $this->getData(self::TICKET_ID); - } - - /** - * Set ID - * @param int $id - */ - public function setId($id): self - { - return $this->setData(self::TICKET_ID, $id); - } - - /** - * @return void - */ - protected function _construct() - { - $this->_init(ResourceModel\Ticket::class); - } -} diff --git a/test/Expectations/Crud/74/v1/Model/TicketRepository.php b/test/Expectations/Crud/74/v1/Model/TicketRepository.php deleted file mode 100644 index b153e50..0000000 --- a/test/Expectations/Crud/74/v1/Model/TicketRepository.php +++ /dev/null @@ -1,115 +0,0 @@ -resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; - } - - /** - * @throws NoSuchEntityException - */ - public function getById(int $entityId): TicketInterface - { - $entity = $this->entityFactory->create(); - $this->resource->load($entity, $entityId); - if (!$entity->getId()) { - throw new NoSuchEntityException( - __('A Sample Module Ticket with id "%1" does not exist', $entityId) - ); - } - - return $entity; - } - - /** - * @throws CouldNotSaveException - */ - public function save(TicketInterface $entity): TicketInterface - { - try { - $this->resource->save($entity); - } catch (\Exception $exception) { - throw new CouldNotSaveException( - __('Could not save the Sample Module Ticket'), - $exception - ); - } - - return $entity; - } - - /** - * @throws CouldNotDeleteException - */ - public function delete(TicketInterface $entity): bool - { - try { - $this->resource->delete($entity); - } catch (\Exception $exception) { - throw new CouldNotDeleteException( - __($exception->getMessage()) - ); - } - - return true; - } - - /** - * @throws NoSuchEntityException - * @throws CouldNotDeleteException - */ - public function deleteById(int $entityId): bool - { - return $this->delete($this->getById($entityId)); - } - - public function getList(SearchCriteriaInterface $criteria): TicketSearchResultsInterface - { - /** @var \Mygento\SampleModule\Model\ResourceModel\Ticket\Collection $collection */ - $collection = $this->collectionFactory->create(); - - $this->collectionProcessor->process($criteria, $collection); - - /** @var TicketSearchResultsInterface $searchResults */ - $searchResults = $this->searchResultsFactory->create(); - $searchResults->setSearchCriteria($criteria); - $searchResults->setItems($collection->getItems()); - $searchResults->setTotalCount($collection->getSize()); - - return $searchResults; - } -} diff --git a/test/Expectations/Crud/74/v1/Model/TicketSearchResults.php b/test/Expectations/Crud/74/v1/Model/TicketSearchResults.php deleted file mode 100644 index 87f9ba9..0000000 --- a/test/Expectations/Crud/74/v1/Model/TicketSearchResults.php +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/test/Expectations/Crud/74/v1/registration.php b/test/Expectations/Crud/74/v1/registration.php deleted file mode 100644 index c7ed4f1..0000000 --- a/test/Expectations/Crud/74/v1/registration.php +++ /dev/null @@ -1,7 +0,0 @@ -filter = $filter; $this->collectionFactory = $collectionFactory; diff --git a/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/NewAction.php b/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/NewAction.php index 5985a1a..7ba8415 100644 --- a/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/NewAction.php +++ b/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/NewAction.php @@ -17,7 +17,7 @@ public function __construct( \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory, \Mygento\SampleModule\Api\ObsoleteRepositoryInterface $repository, \Magento\Framework\Registry $coreRegistry, - \Magento\Backend\App\Action\Context $context + \Magento\Backend\App\Action\Context $context, ) { parent::__construct($repository, $coreRegistry, $context); diff --git a/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/Save.php b/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/Save.php index be13442..58d6951 100644 --- a/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/Save.php +++ b/test/Expectations/Crud/81/v1/Controller/Adminhtml/Obsolete/Save.php @@ -25,7 +25,7 @@ public function __construct( \Mygento\SampleModule\Api\Data\ObsoleteInterfaceFactory $entityFactory, \Mygento\SampleModule\Api\ObsoleteRepositoryInterface $repository, \Magento\Framework\Registry $coreRegistry, - \Magento\Backend\App\Action\Context $context + \Magento\Backend\App\Action\Context $context, ) { parent::__construct($repository, $coreRegistry, $context); diff --git a/test/Expectations/Crud/81/v1/Model/Card/DataProvider.php b/test/Expectations/Crud/81/v1/Model/Card/DataProvider.php index 4fe319f..1cac21b 100644 --- a/test/Expectations/Crud/81/v1/Model/Card/DataProvider.php +++ b/test/Expectations/Crud/81/v1/Model/Card/DataProvider.php @@ -24,7 +24,7 @@ public function __construct( string $requestFieldName, array $meta = [], array $data = [], - PoolInterface $pool = null + PoolInterface $pool = null, ) { parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool); diff --git a/test/Expectations/Crud/81/v1/Model/CartItem/DataProvider.php b/test/Expectations/Crud/81/v1/Model/CartItem/DataProvider.php index 83afa65..33f6e17 100644 --- a/test/Expectations/Crud/81/v1/Model/CartItem/DataProvider.php +++ b/test/Expectations/Crud/81/v1/Model/CartItem/DataProvider.php @@ -24,7 +24,7 @@ public function __construct( string $requestFieldName, array $meta = [], array $data = [], - PoolInterface $pool = null + PoolInterface $pool = null, ) { parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool); diff --git a/test/Expectations/Crud/81/v1/Model/Columns/DataProvider.php b/test/Expectations/Crud/81/v1/Model/Columns/DataProvider.php index 6ab7798..1ecbba9 100644 --- a/test/Expectations/Crud/81/v1/Model/Columns/DataProvider.php +++ b/test/Expectations/Crud/81/v1/Model/Columns/DataProvider.php @@ -24,7 +24,7 @@ public function __construct( string $requestFieldName, array $meta = [], array $data = [], - PoolInterface $pool = null + PoolInterface $pool = null, ) { parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool); diff --git a/test/Expectations/Crud/81/v1/Model/Obsolete/DataProvider.php b/test/Expectations/Crud/81/v1/Model/Obsolete/DataProvider.php index 36a1a5e..e7ebc1f 100644 --- a/test/Expectations/Crud/81/v1/Model/Obsolete/DataProvider.php +++ b/test/Expectations/Crud/81/v1/Model/Obsolete/DataProvider.php @@ -35,7 +35,7 @@ public function __construct( string $requestFieldName, array $meta = [], array $data = [], - PoolInterface $pool = null + PoolInterface $pool = null, ) { parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool); diff --git a/test/Expectations/Crud/81/v1/Model/ObsoleteRepository.php b/test/Expectations/Crud/81/v1/Model/ObsoleteRepository.php index 6bbb775..3a76d9f 100644 --- a/test/Expectations/Crud/81/v1/Model/ObsoleteRepository.php +++ b/test/Expectations/Crud/81/v1/Model/ObsoleteRepository.php @@ -39,7 +39,7 @@ public function __construct( ResourceModel\Obsolete\CollectionFactory $collectionFactory, \Mygento\SampleModule\Api\Data\ObsoleteInterfaceFactory $entityFactory, \Mygento\SampleModule\Api\Data\ObsoleteSearchResultsInterfaceFactory $searchResultsFactory, - CollectionProcessorInterface $collectionProcessor + CollectionProcessorInterface $collectionProcessor, ) { $this->resource = $resource; $this->collectionFactory = $collectionFactory; diff --git a/test/Expectations/Crud/81/v1/Model/Poster/DataProvider.php b/test/Expectations/Crud/81/v1/Model/Poster/DataProvider.php index f2e26df..d62c991 100644 --- a/test/Expectations/Crud/81/v1/Model/Poster/DataProvider.php +++ b/test/Expectations/Crud/81/v1/Model/Poster/DataProvider.php @@ -24,7 +24,7 @@ public function __construct( string $requestFieldName, array $meta = [], array $data = [], - PoolInterface $pool = null + PoolInterface $pool = null, ) { parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool); diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Grid/Collection.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Grid/Collection.php index a87573a..c96e8b5 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Grid/Collection.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Grid/Collection.php @@ -33,7 +33,7 @@ public function __construct( string $resourceModel, string $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, AdapterInterface $connection = null, - AbstractDb $resource = null + AbstractDb $resource = null, ) { parent::__construct( $metadataPool, diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php index a884a57..75c3246 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php @@ -8,8 +8,9 @@ class ReadHandler implements ExtensionInterface { - public function __construct(private readonly Card $resource) - { + public function __construct( + private readonly Card $resource, + ) { } /** diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/CartItem/Grid/Collection.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/CartItem/Grid/Collection.php index 243d212..8a4c6cb 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/CartItem/Grid/Collection.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/CartItem/Grid/Collection.php @@ -31,7 +31,7 @@ public function __construct( string $resourceModel, string $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, AdapterInterface $connection = null, - AbstractDb $resource = null + AbstractDb $resource = null, ) { parent::__construct( $entityFactory, diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/Columns/Grid/Collection.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/Columns/Grid/Collection.php index e612fcf..7020d6f 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/Columns/Grid/Collection.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/Columns/Grid/Collection.php @@ -31,7 +31,7 @@ public function __construct( string $resourceModel, string $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, AdapterInterface $connection = null, - AbstractDb $resource = null + AbstractDb $resource = null, ) { parent::__construct( $entityFactory, diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/Obsolete/Grid/Collection.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/Obsolete/Grid/Collection.php index 8722984..2c5da87 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/Obsolete/Grid/Collection.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/Obsolete/Grid/Collection.php @@ -36,7 +36,7 @@ public function __construct( string $resourceModel, string $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, \Magento\Framework\DB\Adapter\AdapterInterface $connection = null, - \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null + \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null, ) { parent::__construct( $entityFactory, diff --git a/test/Expectations/Crud/81/v1/Model/ResourceModel/Poster/Grid/Collection.php b/test/Expectations/Crud/81/v1/Model/ResourceModel/Poster/Grid/Collection.php index e678daa..549e053 100644 --- a/test/Expectations/Crud/81/v1/Model/ResourceModel/Poster/Grid/Collection.php +++ b/test/Expectations/Crud/81/v1/Model/ResourceModel/Poster/Grid/Collection.php @@ -31,7 +31,7 @@ public function __construct( string $resourceModel, string $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class, AdapterInterface $connection = null, - AbstractDb $resource = null + AbstractDb $resource = null, ) { parent::__construct( $entityFactory, diff --git a/test/Expectations/Crud/74/v1/Api/CardRepositoryInterface.php b/test/Expectations/Crud/83/v1/Api/CardRepositoryInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/CardRepositoryInterface.php rename to test/Expectations/Crud/83/v1/Api/CardRepositoryInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/CartItemRepositoryInterface.php b/test/Expectations/Crud/83/v1/Api/CartItemRepositoryInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/CartItemRepositoryInterface.php rename to test/Expectations/Crud/83/v1/Api/CartItemRepositoryInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/ColumnsRepositoryInterface.php b/test/Expectations/Crud/83/v1/Api/ColumnsRepositoryInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/ColumnsRepositoryInterface.php rename to test/Expectations/Crud/83/v1/Api/ColumnsRepositoryInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/CardInterface.php b/test/Expectations/Crud/83/v1/Api/Data/CardInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/CardInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/CardInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/CardSearchResultsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/CardSearchResultsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/CardSearchResultsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/CardSearchResultsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/CartItemInterface.php b/test/Expectations/Crud/83/v1/Api/Data/CartItemInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/CartItemInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/CartItemInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/CartItemSearchResultsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/CartItemSearchResultsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/CartItemSearchResultsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/CartItemSearchResultsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/ColumnsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/ColumnsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/ColumnsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/ColumnsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/ColumnsSearchResultsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/ColumnsSearchResultsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/ColumnsSearchResultsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/ColumnsSearchResultsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/ObsoleteInterface.php b/test/Expectations/Crud/83/v1/Api/Data/ObsoleteInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/ObsoleteInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/ObsoleteInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/ObsoleteSearchResultsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/ObsoleteSearchResultsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/ObsoleteSearchResultsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/ObsoleteSearchResultsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/PosterInterface.php b/test/Expectations/Crud/83/v1/Api/Data/PosterInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/PosterInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/PosterInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/Data/PosterSearchResultsInterface.php b/test/Expectations/Crud/83/v1/Api/Data/PosterSearchResultsInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/Data/PosterSearchResultsInterface.php rename to test/Expectations/Crud/83/v1/Api/Data/PosterSearchResultsInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/ObsoleteRepositoryInterface.php b/test/Expectations/Crud/83/v1/Api/ObsoleteRepositoryInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/ObsoleteRepositoryInterface.php rename to test/Expectations/Crud/83/v1/Api/ObsoleteRepositoryInterface.php diff --git a/test/Expectations/Crud/74/v1/Api/PosterRepositoryInterface.php b/test/Expectations/Crud/83/v1/Api/PosterRepositoryInterface.php similarity index 100% rename from test/Expectations/Crud/74/v1/Api/PosterRepositoryInterface.php rename to test/Expectations/Crud/83/v1/Api/PosterRepositoryInterface.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card.php similarity index 57% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card.php index efb9030..9085338 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card.php @@ -15,14 +15,11 @@ abstract class Card extends Action */ public const ADMIN_RESOURCE = 'Mygento_SampleModule::card'; - protected Registry $coreRegistry; - protected CardRepositoryInterface $repository; - - public function __construct(CardRepositoryInterface $repository, Registry $coreRegistry, Action\Context $context) - { + public function __construct( + protected readonly CardRepositoryInterface $repository, + protected readonly Registry $coreRegistry, + Action\Context $context, + ) { parent::__construct($context); - - $this->repository = $repository; - $this->coreRegistry = $coreRegistry; } } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Delete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Delete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Delete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Delete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Edit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Edit.php similarity index 87% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Edit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Edit.php index 126fcf3..4c09471 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Edit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Edit.php @@ -13,20 +13,14 @@ class Edit extends Card { - private CardInterfaceFactory $entityFactory; - private PageFactory $resultPageFactory; - public function __construct( - CardInterfaceFactory $entityFactory, - PageFactory $resultPageFactory, + private readonly CardInterfaceFactory $entityFactory, + private readonly PageFactory $resultPageFactory, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->entityFactory = $entityFactory; - $this->resultPageFactory = $resultPageFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Index.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Index.php similarity index 77% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Index.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Index.php index 9b183ad..e99cbac 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Index.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Index.php @@ -12,20 +12,14 @@ class Index extends Card { - private PageFactory $resultPageFactory; - private DataPersistorInterface $dataPersistor; - public function __construct( - PageFactory $resultPageFactory, - DataPersistorInterface $dataPersistor, + private readonly PageFactory $resultPageFactory, + private readonly DataPersistorInterface $dataPersistor, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/InlineEdit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/InlineEdit.php similarity index 93% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/InlineEdit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/InlineEdit.php index 6eb28c4..2ee0199 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/InlineEdit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/InlineEdit.php @@ -12,17 +12,13 @@ class InlineEdit extends Card { - private JsonFactory $jsonFactory; - public function __construct( - JsonFactory $jsonFactory, + private readonly JsonFactory $jsonFactory, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->jsonFactory = $jsonFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/MassDelete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/MassDelete.php similarity index 84% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/MassDelete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/MassDelete.php index be6c505..39de5c0 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/MassDelete.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/MassDelete.php @@ -13,18 +13,13 @@ class MassDelete extends Card { - private Filter $filter; - private CollectionFactory $collectionFactory; - public function __construct( - CollectionFactory $collectionFactory, - Filter $filter, + private readonly CollectionFactory $collectionFactory, + private readonly Filter $filter, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { - $this->filter = $filter; - $this->collectionFactory = $collectionFactory; parent::__construct($repository, $coreRegistry, $context); } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/NewAction.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/NewAction.php similarity index 82% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/NewAction.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/NewAction.php index 7a7c399..80db90f 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/NewAction.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/NewAction.php @@ -11,17 +11,13 @@ class NewAction extends Card { - private ForwardFactory $resultForwardFactory; - public function __construct( - ForwardFactory $resultForwardFactory, + private readonly ForwardFactory $resultForwardFactory, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultForwardFactory = $resultForwardFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Save.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Save.php similarity index 90% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Save.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Save.php index 925be37..e8da5c7 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Card/Save.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Card/Save.php @@ -14,20 +14,14 @@ class Save extends Card { - private DataPersistorInterface $dataPersistor; - private CardInterfaceFactory $entityFactory; - public function __construct( - DataPersistorInterface $dataPersistor, - CardInterfaceFactory $entityFactory, + private readonly DataPersistorInterface $dataPersistor, + private readonly CardInterfaceFactory $entityFactory, CardRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->dataPersistor = $dataPersistor; - $this->entityFactory = $entityFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem.php similarity index 57% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem.php index 9bdb650..7ee7bb8 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem.php @@ -15,14 +15,11 @@ abstract class CartItem extends Action */ public const ADMIN_RESOURCE = 'Mygento_SampleModule::cartitem'; - protected Registry $coreRegistry; - protected CartItemRepositoryInterface $repository; - - public function __construct(CartItemRepositoryInterface $repository, Registry $coreRegistry, Action\Context $context) - { + public function __construct( + protected readonly CartItemRepositoryInterface $repository, + protected readonly Registry $coreRegistry, + Action\Context $context, + ) { parent::__construct($context); - - $this->repository = $repository; - $this->coreRegistry = $coreRegistry; } } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Delete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Delete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Delete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Delete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Edit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Edit.php similarity index 87% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Edit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Edit.php index 888910f..adb8544 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Edit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Edit.php @@ -13,20 +13,14 @@ class Edit extends CartItem { - private CartItemInterfaceFactory $entityFactory; - private PageFactory $resultPageFactory; - public function __construct( - CartItemInterfaceFactory $entityFactory, - PageFactory $resultPageFactory, + private readonly CartItemInterfaceFactory $entityFactory, + private readonly PageFactory $resultPageFactory, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->entityFactory = $entityFactory; - $this->resultPageFactory = $resultPageFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Index.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Index.php similarity index 78% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Index.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Index.php index 3d64e74..ab659aa 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Index.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Index.php @@ -12,20 +12,14 @@ class Index extends CartItem { - private PageFactory $resultPageFactory; - private DataPersistorInterface $dataPersistor; - public function __construct( - PageFactory $resultPageFactory, - DataPersistorInterface $dataPersistor, + private readonly PageFactory $resultPageFactory, + private readonly DataPersistorInterface $dataPersistor, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/InlineEdit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/InlineEdit.php similarity index 93% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/InlineEdit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/InlineEdit.php index 46ea5da..059c13a 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/InlineEdit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/InlineEdit.php @@ -12,17 +12,13 @@ class InlineEdit extends CartItem { - private JsonFactory $jsonFactory; - public function __construct( - JsonFactory $jsonFactory, + private readonly JsonFactory $jsonFactory, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->jsonFactory = $jsonFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/MassDelete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/MassDelete.php similarity index 84% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/MassDelete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/MassDelete.php index ae7b8af..87ac680 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/MassDelete.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/MassDelete.php @@ -13,18 +13,13 @@ class MassDelete extends CartItem { - private Filter $filter; - private CollectionFactory $collectionFactory; - public function __construct( - CollectionFactory $collectionFactory, - Filter $filter, + private readonly CollectionFactory $collectionFactory, + private readonly Filter $filter, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { - $this->filter = $filter; - $this->collectionFactory = $collectionFactory; parent::__construct($repository, $coreRegistry, $context); } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/NewAction.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/NewAction.php similarity index 82% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/NewAction.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/NewAction.php index 7c9996f..617be48 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/NewAction.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/NewAction.php @@ -11,17 +11,13 @@ class NewAction extends CartItem { - private ForwardFactory $resultForwardFactory; - public function __construct( - ForwardFactory $resultForwardFactory, + private readonly ForwardFactory $resultForwardFactory, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultForwardFactory = $resultForwardFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Save.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Save.php similarity index 90% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Save.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Save.php index f3ba568..1576426 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/CartItem/Save.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/CartItem/Save.php @@ -14,20 +14,14 @@ class Save extends CartItem { - private DataPersistorInterface $dataPersistor; - private CartItemInterfaceFactory $entityFactory; - public function __construct( - DataPersistorInterface $dataPersistor, - CartItemInterfaceFactory $entityFactory, + private readonly DataPersistorInterface $dataPersistor, + private readonly CartItemInterfaceFactory $entityFactory, CartItemRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->dataPersistor = $dataPersistor; - $this->entityFactory = $entityFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns.php similarity index 57% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns.php index a518829..063a1e6 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns.php @@ -15,14 +15,11 @@ abstract class Columns extends Action */ public const ADMIN_RESOURCE = 'Mygento_SampleModule::columns'; - protected Registry $coreRegistry; - protected ColumnsRepositoryInterface $repository; - - public function __construct(ColumnsRepositoryInterface $repository, Registry $coreRegistry, Action\Context $context) - { + public function __construct( + protected readonly ColumnsRepositoryInterface $repository, + protected readonly Registry $coreRegistry, + Action\Context $context, + ) { parent::__construct($context); - - $this->repository = $repository; - $this->coreRegistry = $coreRegistry; } } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Delete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Delete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Delete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Delete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Edit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Edit.php similarity index 87% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Edit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Edit.php index 17e77c2..a6806d0 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Edit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Edit.php @@ -13,20 +13,14 @@ class Edit extends Columns { - private ColumnsInterfaceFactory $entityFactory; - private PageFactory $resultPageFactory; - public function __construct( - ColumnsInterfaceFactory $entityFactory, - PageFactory $resultPageFactory, + private readonly ColumnsInterfaceFactory $entityFactory, + private readonly PageFactory $resultPageFactory, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->entityFactory = $entityFactory; - $this->resultPageFactory = $resultPageFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Index.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Index.php similarity index 78% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Index.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Index.php index c32da73..693c393 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Index.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Index.php @@ -12,20 +12,14 @@ class Index extends Columns { - private PageFactory $resultPageFactory; - private DataPersistorInterface $dataPersistor; - public function __construct( - PageFactory $resultPageFactory, - DataPersistorInterface $dataPersistor, + private readonly PageFactory $resultPageFactory, + private readonly DataPersistorInterface $dataPersistor, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/InlineEdit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/InlineEdit.php similarity index 93% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/InlineEdit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/InlineEdit.php index 5f4b437..d38fd2d 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/InlineEdit.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/InlineEdit.php @@ -12,17 +12,13 @@ class InlineEdit extends Columns { - private JsonFactory $jsonFactory; - public function __construct( - JsonFactory $jsonFactory, + private readonly JsonFactory $jsonFactory, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->jsonFactory = $jsonFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/MassDelete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/MassDelete.php similarity index 84% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/MassDelete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/MassDelete.php index 13d7a09..838c543 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/MassDelete.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/MassDelete.php @@ -13,18 +13,13 @@ class MassDelete extends Columns { - private Filter $filter; - private CollectionFactory $collectionFactory; - public function __construct( - CollectionFactory $collectionFactory, - Filter $filter, + private readonly CollectionFactory $collectionFactory, + private readonly Filter $filter, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { - $this->filter = $filter; - $this->collectionFactory = $collectionFactory; parent::__construct($repository, $coreRegistry, $context); } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/NewAction.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/NewAction.php similarity index 82% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/NewAction.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/NewAction.php index 80cc1e2..5ff63b5 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/NewAction.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/NewAction.php @@ -11,17 +11,13 @@ class NewAction extends Columns { - private ForwardFactory $resultForwardFactory; - public function __construct( - ForwardFactory $resultForwardFactory, + private readonly ForwardFactory $resultForwardFactory, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultForwardFactory = $resultForwardFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Save.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Save.php similarity index 90% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Save.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Save.php index dff1bcf..73c4248 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Columns/Save.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Columns/Save.php @@ -14,20 +14,14 @@ class Save extends Columns { - private DataPersistorInterface $dataPersistor; - private ColumnsInterfaceFactory $entityFactory; - public function __construct( - DataPersistorInterface $dataPersistor, - ColumnsInterfaceFactory $entityFactory, + private readonly DataPersistorInterface $dataPersistor, + private readonly ColumnsInterfaceFactory $entityFactory, ColumnsRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->dataPersistor = $dataPersistor; - $this->entityFactory = $entityFactory; } /** diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Delete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Delete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Delete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Delete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Edit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Edit.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Edit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Edit.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Index.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Index.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Index.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Index.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/InlineEdit.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/InlineEdit.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/InlineEdit.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/InlineEdit.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/MassDelete.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/MassDelete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/MassDelete.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/MassDelete.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/NewAction.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/NewAction.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/NewAction.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/NewAction.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Save.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Save.php similarity index 100% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Obsolete/Save.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Obsolete/Save.php diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster.php similarity index 57% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster.php index 7c93781..5507757 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster.php @@ -15,14 +15,11 @@ abstract class Poster extends Action */ public const ADMIN_RESOURCE = 'Mygento_SampleModule::poster'; - protected Registry $coreRegistry; - protected PosterRepositoryInterface $repository; - - public function __construct(PosterRepositoryInterface $repository, Registry $coreRegistry, Action\Context $context) - { + public function __construct( + protected readonly PosterRepositoryInterface $repository, + protected readonly Registry $coreRegistry, + Action\Context $context, + ) { parent::__construct($context); - - $this->repository = $repository; - $this->coreRegistry = $coreRegistry; } } diff --git a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster/Index.php b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster/Index.php similarity index 78% rename from test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster/Index.php rename to test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster/Index.php index 0c8b2ec..c28ca72 100644 --- a/test/Expectations/Crud/74/v1/Controller/Adminhtml/Poster/Index.php +++ b/test/Expectations/Crud/83/v1/Controller/Adminhtml/Poster/Index.php @@ -12,20 +12,14 @@ class Index extends Poster { - private PageFactory $resultPageFactory; - private DataPersistorInterface $dataPersistor; - public function __construct( - PageFactory $resultPageFactory, - DataPersistorInterface $dataPersistor, + private readonly PageFactory $resultPageFactory, + private readonly DataPersistorInterface $dataPersistor, PosterRepositoryInterface $repository, Registry $coreRegistry, - Context $context + Context $context, ) { parent::__construct($repository, $coreRegistry, $context); - - $this->resultPageFactory = $resultPageFactory; - $this->dataPersistor = $dataPersistor; } /** diff --git a/test/Expectations/Crud/74/v1/Model/Card.php b/test/Expectations/Crud/83/v1/Model/Card.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Card.php rename to test/Expectations/Crud/83/v1/Model/Card.php diff --git a/test/Expectations/Crud/74/v1/Model/Card/DataProvider.php b/test/Expectations/Crud/83/v1/Model/Card/DataProvider.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Card/DataProvider.php rename to test/Expectations/Crud/83/v1/Model/Card/DataProvider.php diff --git a/test/Expectations/Crud/74/v1/Model/CardRepository.php b/test/Expectations/Crud/83/v1/Model/CardRepository.php similarity index 77% rename from test/Expectations/Crud/74/v1/Model/CardRepository.php rename to test/Expectations/Crud/83/v1/Model/CardRepository.php index 27a6e0f..41d04d3 100644 --- a/test/Expectations/Crud/74/v1/Model/CardRepository.php +++ b/test/Expectations/Crud/83/v1/Model/CardRepository.php @@ -20,27 +20,14 @@ */ class CardRepository implements CardRepositoryInterface { - private ResourceModel\Card $resource; - private CollectionFactory $collectionFactory; - private CardInterfaceFactory $entityFactory; - private CardSearchResultsInterfaceFactory $searchResultsFactory; - private StoreManagerInterface $storeManager; - private CollectionProcessorInterface $collectionProcessor; - public function __construct( - ResourceModel\Card $resource, - CollectionFactory $collectionFactory, - CardInterfaceFactory $entityFactory, - CardSearchResultsInterfaceFactory $searchResultsFactory, - StoreManagerInterface $storeManager, - CollectionProcessorInterface $collectionProcessor + private readonly ResourceModel\Card $resource, + private readonly CollectionFactory $collectionFactory, + private readonly CardInterfaceFactory $entityFactory, + private readonly CardSearchResultsInterfaceFactory $searchResultsFactory, + private readonly StoreManagerInterface $storeManager, + private readonly CollectionProcessorInterface $collectionProcessor, ) { - $this->resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; - $this->storeManager = $storeManager; } /** diff --git a/test/Expectations/Crud/74/v1/Model/CardSearchResults.php b/test/Expectations/Crud/83/v1/Model/CardSearchResults.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/CardSearchResults.php rename to test/Expectations/Crud/83/v1/Model/CardSearchResults.php diff --git a/test/Expectations/Crud/74/v1/Model/CartItem.php b/test/Expectations/Crud/83/v1/Model/CartItem.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/CartItem.php rename to test/Expectations/Crud/83/v1/Model/CartItem.php diff --git a/test/Expectations/Crud/74/v1/Model/CartItem/DataProvider.php b/test/Expectations/Crud/83/v1/Model/CartItem/DataProvider.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/CartItem/DataProvider.php rename to test/Expectations/Crud/83/v1/Model/CartItem/DataProvider.php diff --git a/test/Expectations/Crud/74/v1/Model/CartItemRepository.php b/test/Expectations/Crud/83/v1/Model/CartItemRepository.php similarity index 78% rename from test/Expectations/Crud/74/v1/Model/CartItemRepository.php rename to test/Expectations/Crud/83/v1/Model/CartItemRepository.php index 4783232..80ece61 100644 --- a/test/Expectations/Crud/74/v1/Model/CartItemRepository.php +++ b/test/Expectations/Crud/83/v1/Model/CartItemRepository.php @@ -19,24 +19,13 @@ */ class CartItemRepository implements CartItemRepositoryInterface { - private ResourceModel\CartItem $resource; - private CollectionFactory $collectionFactory; - private CartItemInterfaceFactory $entityFactory; - private CartItemSearchResultsInterfaceFactory $searchResultsFactory; - private CollectionProcessorInterface $collectionProcessor; - public function __construct( - ResourceModel\CartItem $resource, - CollectionFactory $collectionFactory, - CartItemInterfaceFactory $entityFactory, - CartItemSearchResultsInterfaceFactory $searchResultsFactory, - CollectionProcessorInterface $collectionProcessor + private readonly ResourceModel\CartItem $resource, + private readonly CollectionFactory $collectionFactory, + private readonly CartItemInterfaceFactory $entityFactory, + private readonly CartItemSearchResultsInterfaceFactory $searchResultsFactory, + private readonly CollectionProcessorInterface $collectionProcessor, ) { - $this->resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; } /** diff --git a/test/Expectations/Crud/74/v1/Model/CartItemSearchResults.php b/test/Expectations/Crud/83/v1/Model/CartItemSearchResults.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/CartItemSearchResults.php rename to test/Expectations/Crud/83/v1/Model/CartItemSearchResults.php diff --git a/test/Expectations/Crud/74/v1/Model/Columns.php b/test/Expectations/Crud/83/v1/Model/Columns.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Columns.php rename to test/Expectations/Crud/83/v1/Model/Columns.php diff --git a/test/Expectations/Crud/74/v1/Model/Columns/DataProvider.php b/test/Expectations/Crud/83/v1/Model/Columns/DataProvider.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Columns/DataProvider.php rename to test/Expectations/Crud/83/v1/Model/Columns/DataProvider.php diff --git a/test/Expectations/Crud/74/v1/Model/ColumnsRepository.php b/test/Expectations/Crud/83/v1/Model/ColumnsRepository.php similarity index 78% rename from test/Expectations/Crud/74/v1/Model/ColumnsRepository.php rename to test/Expectations/Crud/83/v1/Model/ColumnsRepository.php index 0ed79c4..b6af139 100644 --- a/test/Expectations/Crud/74/v1/Model/ColumnsRepository.php +++ b/test/Expectations/Crud/83/v1/Model/ColumnsRepository.php @@ -19,24 +19,13 @@ */ class ColumnsRepository implements ColumnsRepositoryInterface { - private ResourceModel\Columns $resource; - private CollectionFactory $collectionFactory; - private ColumnsInterfaceFactory $entityFactory; - private ColumnsSearchResultsInterfaceFactory $searchResultsFactory; - private CollectionProcessorInterface $collectionProcessor; - public function __construct( - ResourceModel\Columns $resource, - CollectionFactory $collectionFactory, - ColumnsInterfaceFactory $entityFactory, - ColumnsSearchResultsInterfaceFactory $searchResultsFactory, - CollectionProcessorInterface $collectionProcessor + private readonly ResourceModel\Columns $resource, + private readonly CollectionFactory $collectionFactory, + private readonly ColumnsInterfaceFactory $entityFactory, + private readonly ColumnsSearchResultsInterfaceFactory $searchResultsFactory, + private readonly CollectionProcessorInterface $collectionProcessor, ) { - $this->resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; } /** diff --git a/test/Expectations/Crud/74/v1/Model/ColumnsSearchResults.php b/test/Expectations/Crud/83/v1/Model/ColumnsSearchResults.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ColumnsSearchResults.php rename to test/Expectations/Crud/83/v1/Model/ColumnsSearchResults.php diff --git a/test/Expectations/Crud/74/v1/Model/Obsolete.php b/test/Expectations/Crud/83/v1/Model/Obsolete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Obsolete.php rename to test/Expectations/Crud/83/v1/Model/Obsolete.php diff --git a/test/Expectations/Crud/74/v1/Model/Obsolete/DataProvider.php b/test/Expectations/Crud/83/v1/Model/Obsolete/DataProvider.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Obsolete/DataProvider.php rename to test/Expectations/Crud/83/v1/Model/Obsolete/DataProvider.php diff --git a/test/Expectations/Crud/74/v1/Model/ObsoleteRepository.php b/test/Expectations/Crud/83/v1/Model/ObsoleteRepository.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ObsoleteRepository.php rename to test/Expectations/Crud/83/v1/Model/ObsoleteRepository.php diff --git a/test/Expectations/Crud/74/v1/Model/ObsoleteSearchResults.php b/test/Expectations/Crud/83/v1/Model/ObsoleteSearchResults.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ObsoleteSearchResults.php rename to test/Expectations/Crud/83/v1/Model/ObsoleteSearchResults.php diff --git a/test/Expectations/Crud/74/v1/Model/Poster.php b/test/Expectations/Crud/83/v1/Model/Poster.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Poster.php rename to test/Expectations/Crud/83/v1/Model/Poster.php diff --git a/test/Expectations/Crud/74/v1/Model/Poster/DataProvider.php b/test/Expectations/Crud/83/v1/Model/Poster/DataProvider.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/Poster/DataProvider.php rename to test/Expectations/Crud/83/v1/Model/Poster/DataProvider.php diff --git a/test/Expectations/Crud/74/v1/Model/PosterRepository.php b/test/Expectations/Crud/83/v1/Model/PosterRepository.php similarity index 78% rename from test/Expectations/Crud/74/v1/Model/PosterRepository.php rename to test/Expectations/Crud/83/v1/Model/PosterRepository.php index 1ab97b4..e243ef5 100644 --- a/test/Expectations/Crud/74/v1/Model/PosterRepository.php +++ b/test/Expectations/Crud/83/v1/Model/PosterRepository.php @@ -19,24 +19,13 @@ */ class PosterRepository implements PosterRepositoryInterface { - private ResourceModel\Poster $resource; - private CollectionFactory $collectionFactory; - private PosterInterfaceFactory $entityFactory; - private PosterSearchResultsInterfaceFactory $searchResultsFactory; - private CollectionProcessorInterface $collectionProcessor; - public function __construct( - ResourceModel\Poster $resource, - CollectionFactory $collectionFactory, - PosterInterfaceFactory $entityFactory, - PosterSearchResultsInterfaceFactory $searchResultsFactory, - CollectionProcessorInterface $collectionProcessor + private readonly ResourceModel\Poster $resource, + private readonly CollectionFactory $collectionFactory, + private readonly PosterInterfaceFactory $entityFactory, + private readonly PosterSearchResultsInterfaceFactory $searchResultsFactory, + private readonly CollectionProcessorInterface $collectionProcessor, ) { - $this->resource = $resource; - $this->collectionFactory = $collectionFactory; - $this->entityFactory = $entityFactory; - $this->searchResultsFactory = $searchResultsFactory; - $this->collectionProcessor = $collectionProcessor; } /** diff --git a/test/Expectations/Crud/74/v1/Model/PosterSearchResults.php b/test/Expectations/Crud/83/v1/Model/PosterSearchResults.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/PosterSearchResults.php rename to test/Expectations/Crud/83/v1/Model/PosterSearchResults.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card.php similarity index 88% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Card.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Card.php index b55c93f..adca5d1 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card.php @@ -14,18 +14,13 @@ class Card extends AbstractDb public const TABLE_NAME = 'mygento_sample_module_card'; public const TABLE_PRIMARY_KEY = 'card_id'; - private EntityManager $entityManager; - private MetadataPool $metadataPool; - public function __construct( - EntityManager $entityManager, - MetadataPool $metadataPool, + private readonly EntityManager $entityManager, + private readonly MetadataPool $metadataPool, Context $context, - string $connectionName = null + string $connectionName = null, ) { parent::__construct($context, $connectionName); - $this->entityManager = $entityManager; - $this->metadataPool = $metadataPool; } /** diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Collection.php similarity index 94% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Collection.php index e8ac53a..79b083e 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Collection.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Collection.php @@ -19,19 +19,17 @@ class Collection extends AbstractCollection /** @var string */ protected $_idFieldName = CardResource::TABLE_PRIMARY_KEY; - private MetadataPool $metadataPool; - /** * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( - MetadataPool $metadataPool, + private readonly MetadataPool $metadataPool, EntityFactoryInterface $entityFactory, LoggerInterface $logger, FetchStrategyInterface $fetchStrategy, ManagerInterface $eventManager, AdapterInterface $connection = null, - AbstractDb $resource = null + AbstractDb $resource = null, ) { parent::__construct( $entityFactory, @@ -41,7 +39,6 @@ public function __construct( $connection, $resource ); - $this->metadataPool = $metadataPool; } /** diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Grid/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Grid/Collection.php similarity index 97% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Grid/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Grid/Collection.php index a87573a..aa3f61d 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Grid/Collection.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Grid/Collection.php @@ -19,7 +19,7 @@ class Collection extends ParentCollection implements SearchResultInterface protected AggregationInterface $aggregations; /** - * @SuppressWarnings(PHPMD.ExcessiveParameterList) + * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool */ public function __construct( MetadataPool $metadataPool, diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php similarity index 85% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php index 24c2313..a884a57 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/ReadHandler.php @@ -8,11 +8,8 @@ class ReadHandler implements ExtensionInterface { - private Card $resource; - - public function __construct(Card $resource) + public function __construct(private readonly Card $resource) { - $this->resource = $resource; } /** diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php similarity index 87% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php index 3a2e5be..369b40a 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Card/Relation/Store/SaveHandler.php @@ -9,13 +9,10 @@ class SaveHandler implements ExtensionInterface { - private Card $resource; - private MetadataPool $metadataPool; - - public function __construct(Card $resource, MetadataPool $metadataPool) - { - $this->resource = $resource; - $this->metadataPool = $metadataPool; + public function __construct( + private readonly Card $resource, + private readonly MetadataPool $metadataPool, + ) { } /** diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem/Collection.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem/Collection.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem/Grid/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem/Grid/Collection.php similarity index 97% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem/Grid/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem/Grid/Collection.php index 243d212..04c5cc9 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/CartItem/Grid/Collection.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/CartItem/Grid/Collection.php @@ -17,9 +17,6 @@ class Collection extends ParentCollection implements SearchResultInterface { protected AggregationInterface $aggregations; - /** - * @SuppressWarnings(PHPMD.ExcessiveParameterList) - */ public function __construct( EntityFactoryInterface $entityFactory, LoggerInterface $logger, diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Columns.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Columns.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Columns.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Columns.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Columns/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Columns/Collection.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Columns/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Columns/Collection.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Columns/Grid/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Columns/Grid/Collection.php similarity index 97% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Columns/Grid/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Columns/Grid/Collection.php index e612fcf..6749cb5 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Columns/Grid/Collection.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Columns/Grid/Collection.php @@ -17,9 +17,6 @@ class Collection extends ParentCollection implements SearchResultInterface { protected AggregationInterface $aggregations; - /** - * @SuppressWarnings(PHPMD.ExcessiveParameterList) - */ public function __construct( EntityFactoryInterface $entityFactory, LoggerInterface $logger, diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete/Collection.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete/Collection.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete/Grid/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete/Grid/Collection.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Obsolete/Grid/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Obsolete/Grid/Collection.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Poster.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Poster.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Poster.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Poster.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Poster/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Poster/Collection.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Poster/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Poster/Collection.php diff --git a/test/Expectations/Crud/74/v1/Model/ResourceModel/Poster/Grid/Collection.php b/test/Expectations/Crud/83/v1/Model/ResourceModel/Poster/Grid/Collection.php similarity index 97% rename from test/Expectations/Crud/74/v1/Model/ResourceModel/Poster/Grid/Collection.php rename to test/Expectations/Crud/83/v1/Model/ResourceModel/Poster/Grid/Collection.php index e678daa..c5dfe4f 100644 --- a/test/Expectations/Crud/74/v1/Model/ResourceModel/Poster/Grid/Collection.php +++ b/test/Expectations/Crud/83/v1/Model/ResourceModel/Poster/Grid/Collection.php @@ -17,9 +17,6 @@ class Collection extends ParentCollection implements SearchResultInterface { protected AggregationInterface $aggregations; - /** - * @SuppressWarnings(PHPMD.ExcessiveParameterList) - */ public function __construct( EntityFactoryInterface $entityFactory, LoggerInterface $logger, diff --git a/test/Expectations/Crud/74/v1/Model/SearchCriteria/CardStoreFilter.php b/test/Expectations/Crud/83/v1/Model/SearchCriteria/CardStoreFilter.php similarity index 100% rename from test/Expectations/Crud/74/v1/Model/SearchCriteria/CardStoreFilter.php rename to test/Expectations/Crud/83/v1/Model/SearchCriteria/CardStoreFilter.php diff --git a/test/Expectations/Crud/74/v1/Ui/Component/Listing/CardActions.php b/test/Expectations/Crud/83/v1/Ui/Component/Listing/CardActions.php similarity index 100% rename from test/Expectations/Crud/74/v1/Ui/Component/Listing/CardActions.php rename to test/Expectations/Crud/83/v1/Ui/Component/Listing/CardActions.php diff --git a/test/Expectations/Crud/74/v1/Ui/Component/Listing/CartItemActions.php b/test/Expectations/Crud/83/v1/Ui/Component/Listing/CartItemActions.php similarity index 100% rename from test/Expectations/Crud/74/v1/Ui/Component/Listing/CartItemActions.php rename to test/Expectations/Crud/83/v1/Ui/Component/Listing/CartItemActions.php diff --git a/test/Expectations/Crud/74/v1/Ui/Component/Listing/ColumnsActions.php b/test/Expectations/Crud/83/v1/Ui/Component/Listing/ColumnsActions.php similarity index 100% rename from test/Expectations/Crud/74/v1/Ui/Component/Listing/ColumnsActions.php rename to test/Expectations/Crud/83/v1/Ui/Component/Listing/ColumnsActions.php diff --git a/test/Expectations/Crud/74/v1/Ui/Component/Listing/ObsoleteActions.php b/test/Expectations/Crud/83/v1/Ui/Component/Listing/ObsoleteActions.php similarity index 100% rename from test/Expectations/Crud/74/v1/Ui/Component/Listing/ObsoleteActions.php rename to test/Expectations/Crud/83/v1/Ui/Component/Listing/ObsoleteActions.php diff --git a/test/Expectations/Crud/74/v1/etc/acl.xml b/test/Expectations/Crud/83/v1/etc/acl.xml similarity index 92% rename from test/Expectations/Crud/74/v1/etc/acl.xml rename to test/Expectations/Crud/83/v1/etc/acl.xml index efe325a..35569b4 100644 --- a/test/Expectations/Crud/74/v1/etc/acl.xml +++ b/test/Expectations/Crud/83/v1/etc/acl.xml @@ -8,7 +8,6 @@ - diff --git a/test/Expectations/Crud/74/v1/etc/adminhtml/menu.xml b/test/Expectations/Crud/83/v1/etc/adminhtml/menu.xml similarity index 100% rename from test/Expectations/Crud/74/v1/etc/adminhtml/menu.xml rename to test/Expectations/Crud/83/v1/etc/adminhtml/menu.xml diff --git a/test/Expectations/Crud/74/v1/etc/adminhtml/routes.xml b/test/Expectations/Crud/83/v1/etc/adminhtml/routes.xml similarity index 100% rename from test/Expectations/Crud/74/v1/etc/adminhtml/routes.xml rename to test/Expectations/Crud/83/v1/etc/adminhtml/routes.xml diff --git a/test/Expectations/Crud/74/v1/etc/db_schema.xml b/test/Expectations/Crud/83/v1/etc/db_schema.xml similarity index 89% rename from test/Expectations/Crud/74/v1/etc/db_schema.xml rename to test/Expectations/Crud/83/v1/etc/db_schema.xml index 353f15d..96aa30b 100644 --- a/test/Expectations/Crud/74/v1/etc/db_schema.xml +++ b/test/Expectations/Crud/83/v1/etc/db_schema.xml @@ -45,7 +45,7 @@ - + @@ -55,7 +55,7 @@
- + @@ -70,14 +70,6 @@
- - - - - - - -
diff --git a/test/Expectations/Crud/74/v1/etc/di.xml b/test/Expectations/Crud/83/v1/etc/di.xml similarity index 90% rename from test/Expectations/Crud/74/v1/etc/di.xml rename to test/Expectations/Crud/83/v1/etc/di.xml index 8dee3f2..7006d34 100644 --- a/test/Expectations/Crud/74/v1/etc/di.xml +++ b/test/Expectations/Crud/83/v1/etc/di.xml @@ -4,19 +4,16 @@ - - - @@ -25,7 +22,6 @@ Mygento\SampleModule\Api\CartItemRepositoryInterface Mygento\SampleModule\Api\ObsoleteRepositoryInterface Mygento\SampleModule\Api\CardRepositoryInterface - Mygento\SampleModule\Api\TicketRepositoryInterface Mygento\SampleModule\Api\PosterRepositoryInterface @@ -73,15 +69,6 @@ - - - - Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor - Magento\Framework\Api\SearchCriteria\CollectionProcessor\PaginationProcessor - - - @@ -111,11 +98,6 @@ Mygento\SampleModule\Model\SearchCriteria\CardCollectionProcessor - - - Mygento\SampleModule\Model\SearchCriteria\TicketCollectionProcessor - - Mygento\SampleModule\Model\SearchCriteria\PosterCollectionProcessor diff --git a/test/Expectations/Crud/74/v1/etc/events.xml b/test/Expectations/Crud/83/v1/etc/events.xml similarity index 100% rename from test/Expectations/Crud/74/v1/etc/events.xml rename to test/Expectations/Crud/83/v1/etc/events.xml diff --git a/test/Expectations/Crud/74/v0/etc/module.xml b/test/Expectations/Crud/83/v1/etc/module.xml similarity index 100% rename from test/Expectations/Crud/74/v0/etc/module.xml rename to test/Expectations/Crud/83/v1/etc/module.xml diff --git a/test/Expectations/Crud/74/v1/etc/webapi.xml b/test/Expectations/Crud/83/v1/etc/webapi.xml similarity index 100% rename from test/Expectations/Crud/74/v1/etc/webapi.xml rename to test/Expectations/Crud/83/v1/etc/webapi.xml diff --git a/test/Expectations/Crud/74/v0/registration.php b/test/Expectations/Crud/83/v1/registration.php similarity index 100% rename from test/Expectations/Crud/74/v0/registration.php rename to test/Expectations/Crud/83/v1/registration.php diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_index.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_index.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_index.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_index.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_new.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_new.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_card_new.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_card_new.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_index.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_index.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_index.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_index.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_new.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_new.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_cartitem_new.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_cartitem_new.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_index.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_index.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_index.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_index.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_new.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_new.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_columns_new.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_columns_new.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_index.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_index.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_index.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_index.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_new.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_new.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_obsolete_new.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_obsolete_new.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_poster_index.xml b/test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_poster_index.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/layout/sample_module_poster_index.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/layout/sample_module_poster_index.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_edit.xml similarity index 96% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_edit.xml index d69f963..a497670 100644 --- a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_edit.xml +++ b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_edit.xml @@ -92,7 +92,6 @@ true category_id - true true @@ -132,9 +131,6 @@ true store_id - - true - diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_listing.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_listing.xml similarity index 98% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_listing.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_listing.xml index ac4e3e8..2da925c 100644 --- a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_card_listing.xml +++ b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_card_listing.xml @@ -139,7 +139,6 @@ text - true true diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml similarity index 99% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml index 9277edd..ec07ef1 100644 --- a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml +++ b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_edit.xml @@ -119,7 +119,6 @@ true customer_group - true true diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml similarity index 99% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml index d67c190..fc18439 100644 --- a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml +++ b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_cartitem_listing.xml @@ -153,7 +153,6 @@ select - true true diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_columns_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_columns_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_columns_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_columns_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_columns_listing.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_columns_listing.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_columns_listing.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_columns_listing.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_obsolete_edit.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_obsolete_edit.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_obsolete_edit.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_obsolete_edit.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_obsolete_listing.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_obsolete_listing.xml similarity index 100% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_obsolete_listing.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_obsolete_listing.xml diff --git a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml similarity index 94% rename from test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml rename to test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml index 37c8a22..72ee234 100644 --- a/test/Expectations/Crud/74/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml +++ b/test/Expectations/Crud/83/v1/view/adminhtml/ui_component/sample_module_poster_listing.xml @@ -104,10 +104,6 @@ text text - - true - true - diff --git a/test/Expectations/Shipping/Model/Carrier.php b/test/Expectations/Shipping/Model/Carrier.php index 98ab6a4..a21f07e 100644 --- a/test/Expectations/Shipping/Model/Carrier.php +++ b/test/Expectations/Shipping/Model/Carrier.php @@ -24,7 +24,7 @@ public function __construct( \Mygento\SampleModule\Helper\Data $helper, Service $scopeConfig, Service $rateErrorFactory, - Service $logger + Service $logger, ) { $this->service = $service; parent::__construct( diff --git a/test/Shipping/ShippingTest.php b/test/Shipping/ShippingTest.php index 3acf8e7..ba19a9d 100644 --- a/test/Shipping/ShippingTest.php +++ b/test/Shipping/ShippingTest.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; -class CrudTest extends \PHPUnit\Framework\TestCase +class ShippingTest extends \PHPUnit\Framework\TestCase { private const V = 'shipping';