From 1dfd160a795a1e0c3e6717a6cd24b7f77b873d91 Mon Sep 17 00:00:00 2001
From: Simon Sippert <s.sippert@techdivision.com>
Date: Tue, 25 May 2021 16:44:21 +0200
Subject: [PATCH] Fix XSD location of test files
---
CHANGELOG.md | 24 +++++++++++
Controller/Adminhtml/Block/Save.php | 22 ++++++----
Controller/Adminhtml/Page/Save.php | 41 +++++++++++--------
Model/BlockInstaller.php | 5 ++-
Model/Config/Converter.php | 3 +-
Model/Config/SchemaLocator.php | 6 ++-
Model/PageInstaller.php | 5 ++-
README.md | 14 +++----
.../Model/BlockInstaller/TestCase.php | 6 ++-
.../Model/Config/ConverterTest.php | 9 ++--
.../Parser/Query/FetchMediaFilesChainTest.php | 6 ++-
.../Config/_files/content_provisioning.xml | 2 +-
.../Model/PageInstaller/TestCase.php | 6 ++-
.../_files/content_provisioning.xml | 2 +-
install-config-mysql.travis.2.3.php | 14 ++++---
install-config-mysql.travis.2.4.php | 14 ++++---
registration.php | 6 ++-
.../maintained_content_warning.phtml | 5 ++-
18 files changed, 124 insertions(+), 66 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67c6ac..a33f367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
# CHANGELOG
+## 1.3.4
+
+* *Bugfix:* Set correct XSD URN
+* *Bugfix:* Pin composer to Version 1
+
+## 1.3.3
+
+* *Bugfix:* Fix return type of convert on error
+
+## 1.3.2
+
+* *Bugfix:* Fix xml schema reference to pass magento static tests
+
+## 1.3.0 / 1.3.1
+
+* *Feature:* Add Magento 2.4 support
+* *Feature:* Add phpUnit 9 support
+
+## 1.2.4
+
+* *Feature:* Enable PHP 7.2 support
+* *Feature:* Enable PHP 7.3 support
+* *Feature:* Add command to add blocks and pages
+
## 1.2.2 / 1.2.3
* *Bugfix:* `composer.json` blocked installation of the module in Magento 2.2
diff --git a/Controller/Adminhtml/Block/Save.php b/Controller/Adminhtml/Block/Save.php
index 6b48f25..b464178 100644
--- a/Controller/Adminhtml/Block/Save.php
+++ b/Controller/Adminhtml/Block/Save.php
@@ -7,14 +7,18 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Controller\Adminhtml\Block;
+use Exception;
use Firegento\ContentProvisioning\Model\Command\ApplyBlockEntry;
use Firegento\ContentProvisioning\Model\Query\GetBlockEntryByBlock;
use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
use Magento\Cms\Api\BlockRepositoryInterface;
use Magento\Cms\Model\Block;
use Magento\Cms\Model\BlockFactory;
use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Controller\ResultInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Registry;
@@ -66,9 +70,9 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostAc
) {
$this->dataPersistor = $dataPersistor;
$this->blockFactory = $blockFactory
- ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockFactory::class);
+ ?: ObjectManager::getInstance()->get(BlockFactory::class);
$this->blockRepository = $blockRepository
- ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockRepositoryInterface::class);
+ ?: ObjectManager::getInstance()->get(BlockRepositoryInterface::class);
parent::__construct($context, $coreRegistry);
$this->getBlockEntryByBlock = $getBlockEntryByBlock;
$this->applyBlockEntry = $applyBlockEntry;
@@ -78,11 +82,11 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostAc
* Save action
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @return \Magento\Framework\Controller\ResultInterface
+ * @return ResultInterface
*/
public function execute()
{
- /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ /** @var Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
$data = $this->getRequest()->getPostValue();
if ($data) {
@@ -93,7 +97,7 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostAc
$data['block_id'] = null;
}
- /** @var \Magento\Cms\Model\Block $model */
+ /** @var Block $model */
$model = $this->blockFactory->create();
$id = $this->getRequest()->getParam('block_id');
@@ -115,7 +119,7 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostAc
return $this->processBlockReturn($model, $data, $resultRedirect);
} catch (LocalizedException $e) {
$this->messageManager->addErrorMessage($e->getMessage());
- } catch (\Exception $e) {
+ } catch (Exception $e) {
$this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the block.'));
}
@@ -128,11 +132,11 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostAc
/**
* Process and set the block return
*
- * @param \Magento\Cms\Model\Block $model
+ * @param Block $model
* @param array $data
- * @param \Magento\Framework\Controller\ResultInterface $resultRedirect
+ * @param ResultInterface $resultRedirect
*
- * @return \Magento\Framework\Controller\ResultInterface
+ * @return ResultInterface
* @throws LocalizedException
*/
private function processBlockReturn($model, $data, $resultRedirect)
diff --git a/Controller/Adminhtml/Page/Save.php b/Controller/Adminhtml/Page/Save.php
index 40a5e88..2f0dd1a 100644
--- a/Controller/Adminhtml/Page/Save.php
+++ b/Controller/Adminhtml/Page/Save.php
@@ -7,19 +7,26 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Controller\Adminhtml\Page;
+use Exception;
use Firegento\ContentProvisioning\Model\Command\ApplyPageEntry;
use Firegento\ContentProvisioning\Model\Query\GetPageEntryByPage;
use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
use Magento\Cms\Controller\Adminhtml\Page\PostDataProcessor;
use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageFactory;
use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Controller\ResultInterface;
use Magento\Framework\Exception\LocalizedException;
/**
* Save CMS page action.
*/
-class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
+class Save extends Action implements HttpPostActionInterface
{
/**
* Authorization level of a basic admin session
@@ -39,12 +46,12 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
protected $dataPersistor;
/**
- * @var \Magento\Cms\Model\PageFactory
+ * @var PageFactory
*/
private $pageFactory;
/**
- * @var \Magento\Cms\Api\PageRepositoryInterface
+ * @var PageRepositoryInterface
*/
private $pageRepository;
@@ -62,8 +69,8 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
* @param Action\Context $context
* @param PostDataProcessor $dataProcessor
* @param DataPersistorInterface $dataPersistor
- * @param \Magento\Cms\Model\PageFactory|null $pageFactory
- * @param \Magento\Cms\Api\PageRepositoryInterface|null $pageRepository
+ * @param PageFactory|null $pageFactory
+ * @param PageRepositoryInterface|null $pageRepository
*/
public function __construct(
Action\Context $context,
@@ -71,16 +78,16 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
DataPersistorInterface $dataPersistor,
GetPageEntryByPage $getPageEntryByPage,
ApplyPageEntry $applyPageEntry,
- \Magento\Cms\Model\PageFactory $pageFactory = null,
- \Magento\Cms\Api\PageRepositoryInterface $pageRepository = null
+ PageFactory $pageFactory = null,
+ PageRepositoryInterface $pageRepository = null
) {
$this->dataProcessor = $dataProcessor;
$this->dataPersistor = $dataPersistor;
$this->pageFactory = $pageFactory
- ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Cms\Model\PageFactory::class);
+ ?: ObjectManager::getInstance()->get(PageFactory::class);
$this->pageRepository = $pageRepository
- ?: \Magento\Framework\App\ObjectManager::getInstance()
- ->get(\Magento\Cms\Api\PageRepositoryInterface::class);
+ ?: ObjectManager::getInstance()
+ ->get(PageRepositoryInterface::class);
parent::__construct($context);
$this->getPageEntryByPage = $getPageEntryByPage;
$this->applyPageEntry = $applyPageEntry;
@@ -90,12 +97,12 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
* Save action
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @return \Magento\Framework\Controller\ResultInterface
+ * @return ResultInterface
*/
public function execute()
{
$data = $this->getRequest()->getPostValue();
- /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ /** @var Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
if ($data) {
$data = $this->dataProcessor->filter($data);
@@ -106,7 +113,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
$data['page_id'] = null;
}
- /** @var \Magento\Cms\Model\Page $model */
+ /** @var Page $model */
$model = $this->pageFactory->create();
$id = $this->getRequest()->getParam('page_id');
@@ -136,7 +143,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
return $this->processResultRedirect($model, $resultRedirect, $data);
} catch (LocalizedException $e) {
$this->messageManager->addExceptionMessage($e->getPrevious() ?: $e);
- } catch (\Exception $e) {
+ } catch (Exception $e) {
$this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the page.'));
}
@@ -149,10 +156,10 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
/**
* Process result redirect
*
- * @param \Magento\Cms\Api\Data\PageInterface $model
- * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect
+ * @param PageInterface $model
+ * @param Redirect $resultRedirect
* @param array $data
- * @return \Magento\Backend\Model\View\Result\Redirect
+ * @return Redirect
* @throws LocalizedException
*/
private function processResultRedirect($model, $resultRedirect, $data)
diff --git a/Model/BlockInstaller.php b/Model/BlockInstaller.php
index 4463df4..6333d1c 100644
--- a/Model/BlockInstaller.php
+++ b/Model/BlockInstaller.php
@@ -3,6 +3,7 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Model;
+use Exception;
use Firegento\ContentProvisioning\Model\Command\ApplyBlockEntry;
use Firegento\ContentProvisioning\Model\Command\ApplyMediaFiles;
use Firegento\ContentProvisioning\Model\Query\GetBlockEntryList;
@@ -70,7 +71,7 @@ class BlockInstaller
$this->applyBlockEntry->execute($blockEntry);
$this->applyMediaFiles->execute($blockEntry);
}
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
$this->logger->error(sprintf(
'An error appeared while applying cms block content: %s',
$exception->getMessage()
@@ -81,4 +82,4 @@ class BlockInstaller
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Model/Config/Converter.php b/Model/Config/Converter.php
index 17bd4cc..80d5ebc 100644
--- a/Model/Config/Converter.php
+++ b/Model/Config/Converter.php
@@ -3,6 +3,7 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Model\Config;
+use Exception;
use Magento\Framework\Config\ConverterInterface;
use Magento\Framework\Exception\LocalizedException;
use Psr\Log\LoggerInterface;
@@ -50,7 +51,7 @@ class Converter implements ConverterInterface
'pages' => $this->pageNodeConverter->convert($source),
'blocks' => $this->blockNodeConverter->convert($source),
];
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
$this->logger->error($exception->getMessage(), $exception->getTrace());
}
return [];
diff --git a/Model/Config/SchemaLocator.php b/Model/Config/SchemaLocator.php
index ca3abdd..8dbcfd4 100644
--- a/Model/Config/SchemaLocator.php
+++ b/Model/Config/SchemaLocator.php
@@ -3,9 +3,11 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Model\Config;
+use Magento\Framework\Config\SchemaLocatorInterface;
+use Magento\Framework\Module\Dir;
use Magento\Framework\Module\Dir\Reader;
-class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+class SchemaLocator implements SchemaLocatorInterface
{
/**
* Path to corresponding XSD file with validation rules for merged config
@@ -27,7 +29,7 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
public function __construct(Reader $moduleReader)
{
$etcDir = $moduleReader->getModuleDir(
- \Magento\Framework\Module\Dir::MODULE_ETC_DIR,
+ Dir::MODULE_ETC_DIR,
'Firegento_ContentProvisioning'
);
$this->_schema = $etcDir . '/content_provisioning.xsd';
diff --git a/Model/PageInstaller.php b/Model/PageInstaller.php
index 52dd6e6..739fca4 100644
--- a/Model/PageInstaller.php
+++ b/Model/PageInstaller.php
@@ -3,6 +3,7 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Model;
+use Exception;
use Firegento\ContentProvisioning\Model\Command\ApplyMediaFiles;
use Firegento\ContentProvisioning\Model\Command\ApplyPageEntry;
use Firegento\ContentProvisioning\Model\Query\GetPageEntryList;
@@ -70,7 +71,7 @@ class PageInstaller
$this->applyPageEntry->execute($pageEntry);
$this->applyMediaFiles->execute($pageEntry);
}
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
$this->logger->error(sprintf(
'An error appeared while applying cms page content: %s',
$exception->getMessage()
@@ -81,4 +82,4 @@ class PageInstaller
}
}
}
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
index ce5e242..4b6a5f7 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ composer require firegento/magento2-content-provisioning
## How it works
-After installing this module you can create own `content_provisioning.xml` in each of your modules.
+After installing this module you can create your own `content_provisioning.xml` in each of your modules.
## Example configurations
@@ -60,9 +60,9 @@ After installing this module you can create own `content_provisioning.xml` in ea
<content heading="New Page Heading" type="file">Your_Module::path/to/content.html</content>
<media_directory>Your_Module::path/to/media</media_directory>
<stores>
- <store code="germany_german" />
- <store code="swiss_german" />
- <store code="austria_german" />
+ <store code="germany_german"/>
+ <store code="swiss_german"/>
+ <store code="austria_german"/>
</stores>
<seo>
<title>SEO Page Title</title>
@@ -107,9 +107,9 @@ After installing this module you can create own `content_provisioning.xml` in ea
<content type="file">Your_Module::path/to/content.html</content>
<media_directory>Your_Module::path/to/media</media_directory>
<stores>
- <store code="germany_german" />
- <store code="swiss_german" />
- <store code="austria_german" />
+ <store code="germany_german"/>
+ <store code="swiss_german"/>
+ <store code="austria_german"/>
</stores>
</block>
...
diff --git a/Test/Integration/Model/BlockInstaller/TestCase.php b/Test/Integration/Model/BlockInstaller/TestCase.php
index ec2c390..106b649 100644
--- a/Test/Integration/Model/BlockInstaller/TestCase.php
+++ b/Test/Integration/Model/BlockInstaller/TestCase.php
@@ -10,6 +10,8 @@ use Firegento\ContentProvisioning\Model\Query\GetBlockEntryList;
use Firegento\ContentProvisioning\Model\Query\GetFirstBlockByBlockEntry;
use Magento\Cms\Api\Data\BlockInterface;
use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Store\Model\StoreManagerInterface;
use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\MockObject\MockObject;
@@ -118,8 +120,8 @@ class TestCase extends \PHPUnit\Framework\TestCase
/**
* @param BlockEntryInterface $entry
* @return BlockInterface
- * @throws \Magento\Framework\Exception\NoSuchEntityException
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
*/
protected function getBlockByBlockEntry(BlockEntryInterface $entry): BlockInterface
{
diff --git a/Test/Integration/Model/Config/ConverterTest.php b/Test/Integration/Model/Config/ConverterTest.php
index 757fe1b..8440182 100644
--- a/Test/Integration/Model/Config/ConverterTest.php
+++ b/Test/Integration/Model/Config/ConverterTest.php
@@ -3,10 +3,13 @@ declare(strict_types=1);
namespace Firegento\ContentProvisioning\Test\Integration\Model\Config;
+use DOMDocument;
use Firegento\ContentProvisioning\Model\Config\Converter;
use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
-class ConverterTest extends \PHPUnit\Framework\TestCase
+class ConverterTest extends TestCase
{
/**
* @var Converter
@@ -15,7 +18,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
protected function setUp(): void
{
- $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ $this->model = Bootstrap::getObjectManager()
->create(Converter::class);
}
@@ -24,7 +27,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
$pathFiles = __DIR__ . '/../../_files';
$expectedResult = require $pathFiles . '/result.php';
$path = $pathFiles . '/content_provisioning.xml';
- $domDocument = new \DOMDocument();
+ $domDocument = new DOMDocument();
$domDocument->load($path);
$result = $this->model->convert($domDocument);
$this->assertEquals($expectedResult, $result);
diff --git a/Test/Integration/Model/Config/Parser/Query/FetchMediaFilesChainTest.php b/Test/Integration/Model/Config/Parser/Query/FetchMediaFilesChainTest.php
index 25dccf4..4a10298 100644
--- a/Test/Integration/Model/Config/Parser/Query/FetchMediaFilesChainTest.php
+++ b/Test/Integration/Model/Config/Parser/Query/FetchMediaFilesChainTest.php
@@ -5,9 +5,11 @@ namespace Firegento\ContentProvisioning\Test\Integration\Model\Config\Parser\Que
use Firegento\ContentProvisioning\Api\MediaFilesParserInterface;
use Firegento\ContentProvisioning\Model\Config\Parser\Query\FetchMediaFilesChain;
+use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class FetchMediaFilesChainTest extends \PHPUnit\Framework\TestCase
+class FetchMediaFilesChainTest extends TestCase
{
/**
* @var FetchMediaFilesChain
@@ -34,7 +36,7 @@ class FetchMediaFilesChainTest extends \PHPUnit\Framework\TestCase
->disableOriginalConstructor()
->getMock();
- $this->chain = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ $this->chain = Bootstrap::getObjectManager()
->create(FetchMediaFilesChain::class, ['parsers' => [
$this->parser1,
$this->parser2,
diff --git a/Test/Integration/Model/Config/_files/content_provisioning.xml b/Test/Integration/Model/Config/_files/content_provisioning.xml
index 0616ede..aad9ae5 100644
--- a/Test/Integration/Model/Config/_files/content_provisioning.xml
+++ b/Test/Integration/Model/Config/_files/content_provisioning.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Firegento/ContentProvisioning/etc/content_provisioning.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Firegento_ContentProvisioning:etc/content_provisioning.xsd">
<page key="test.page.1" identifier="test-page-1" maintained="true" active="true">
<title>Test Page 1</title>
<content type="file">Firegento_ContentProvisioning::Test/Integration/Model/Config/_files/test-files/file-1.html</content>
diff --git a/Test/Integration/Model/PageInstaller/TestCase.php b/Test/Integration/Model/PageInstaller/TestCase.php
index 15201fc..9e47fa5 100644
--- a/Test/Integration/Model/PageInstaller/TestCase.php
+++ b/Test/Integration/Model/PageInstaller/TestCase.php
@@ -10,6 +10,8 @@ use Firegento\ContentProvisioning\Model\Query\GetFirstPageByPageEntry;
use Firegento\ContentProvisioning\Model\Query\GetPageEntryList;
use Magento\Cms\Api\Data\PageInterface;
use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Store\Model\StoreManagerInterface;
use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\MockObject\MockObject;
@@ -159,8 +161,8 @@ class TestCase extends \PHPUnit\Framework\TestCase
/**
* @param PageEntryInterface $entry
* @return PageInterface
- * @throws \Magento\Framework\Exception\NoSuchEntityException
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws NoSuchEntityException
+ * @throws LocalizedException
*/
protected function getPageByPageEntry(PageEntryInterface $entry): PageInterface
{
diff --git a/Test/Integration/_files/content_provisioning.xml b/Test/Integration/_files/content_provisioning.xml
index d7385cd..b40caef 100644
--- a/Test/Integration/_files/content_provisioning.xml
+++ b/Test/Integration/_files/content_provisioning.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Firegento/ContentProvisioning/etc/content_provisioning.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Firegento_ContentProvisioning:etc/content_provisioning.xsd">
<page key="test.page.1" identifier="test-page-1" maintained="true" active="true">
<title>Test Page 1</title>
<content type="file">Firegento_ContentProvisioning::Test/Integration/_files/content/file-1.html</content>
diff --git a/install-config-mysql.travis.2.3.php b/install-config-mysql.travis.2.3.php
index e97ff22..5341ac5 100644
--- a/install-config-mysql.travis.2.3.php
+++ b/install-config-mysql.travis.2.3.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+use Magento\TestFramework\Bootstrap;
+
return [
'db-host' => '127.0.0.1',
'db-user' => 'root',
@@ -11,13 +13,13 @@ return [
'db-name' => 'magento_integration_tests',
'db-prefix' => 'trv_',
'backend-frontname' => 'backend',
- 'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
- 'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
- 'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
- 'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
- 'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+ 'admin-user' => Bootstrap::ADMIN_NAME,
+ 'admin-password' => Bootstrap::ADMIN_PASSWORD,
+ 'admin-email' => Bootstrap::ADMIN_EMAIL,
+ 'admin-firstname' => Bootstrap::ADMIN_FIRSTNAME,
+ 'admin-lastname' => Bootstrap::ADMIN_LASTNAME,
'amqp-host' => 'localhost',
'amqp-port' => '5672',
'amqp-user' => 'guest',
'amqp-password' => 'guest',
-];
\ No newline at end of file
+];
diff --git a/install-config-mysql.travis.2.4.php b/install-config-mysql.travis.2.4.php
index 477ac42..2481f21 100644
--- a/install-config-mysql.travis.2.4.php
+++ b/install-config-mysql.travis.2.4.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+use Magento\TestFramework\Bootstrap;
+
return [
'db-host' => '127.0.0.1',
'db-user' => 'root',
@@ -11,15 +13,15 @@ return [
'db-name' => 'magento_integration_tests',
'db-prefix' => 'trv_',
'backend-frontname' => 'backend',
- 'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
- 'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
- 'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
- 'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
- 'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+ 'admin-user' => Bootstrap::ADMIN_NAME,
+ 'admin-password' => Bootstrap::ADMIN_PASSWORD,
+ 'admin-email' => Bootstrap::ADMIN_EMAIL,
+ 'admin-firstname' => Bootstrap::ADMIN_FIRSTNAME,
+ 'admin-lastname' => Bootstrap::ADMIN_LASTNAME,
'amqp-host' => 'localhost',
'amqp-port' => '5672',
'amqp-user' => 'guest',
'amqp-password' => 'guest',
'elasticsearch-host' => '127.0.0.1',
'elasticsearch-port' => '9200',
-];
\ No newline at end of file
+];
diff --git a/registration.php b/registration.php
index b8125b7..2e88ac6 100644
--- a/registration.php
+++ b/registration.php
@@ -1,8 +1,10 @@
<?php
declare(strict_types=1);
-\Magento\Framework\Component\ComponentRegistrar::register(
- \Magento\Framework\Component\ComponentRegistrar::MODULE,
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+ ComponentRegistrar::MODULE,
'Firegento_ContentProvisioning',
__DIR__
);
diff --git a/view/adminhtml/templates/maintained_content_warning.phtml b/view/adminhtml/templates/maintained_content_warning.phtml
index 11961e3..a45234c 100644
--- a/view/adminhtml/templates/maintained_content_warning.phtml
+++ b/view/adminhtml/templates/maintained_content_warning.phtml
@@ -1,5 +1,8 @@
<?php
-/** @var \Firegento\ContentProvisioning\Block\MaintainedContentWarning $block */
+/** @var MaintainedContentWarning $block */
+
+use Firegento\ContentProvisioning\Block\MaintainedContentWarning;
+
?>
<?php if ($block->isMaintained()): ?>
<div class="message-system-short">
--
GitLab