diff --git a/.gitignore b/.gitignore
index 98860b5c..422a08ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
.vscode/
.phpunit.result.cache
+.DS_Store
diff --git a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php b/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
deleted file mode 100644
index 765ae5f1..00000000
--- a/Magento2/Sniffs/Legacy/ObsoleteResponseSniff.php
+++ /dev/null
@@ -1,76 +0,0 @@
- 'Please use \Magento\Framework\View\Layout\Builder::build instead.',
- 'renderLayout' => 'Please use \Magento\Framework\Controller\ResultInterface::renderResult instead.',
- '_redirect' => 'Please use \Magento\Backend\Model\View\Result\Redirect::render instead.',
- '_forward' => 'Please use \Magento\Backend\Model\View\Result\Forward::forward instead.',
- '_setActiveMenu' => 'Please use \Magento\Backend\Model\View\Result\Page::setActiveMenu instead.',
- '_addBreadcrumb' => 'Please use \Magento\Backend\Model\View\Result\Page::addBreadcrumb instead.',
- '_addContent' => 'Please use \Magento\Backend\Model\View\Result\Page::addContent instead.',
- '_addLeft' => 'Please use \Magento\Backend\Model\View\Result\Page::addLeft instead.',
- '_addJs' => 'Please use \Magento\Backend\Model\View\Result\Page::addJs instead.',
- '_moveBlockToContainer' => 'Please use \Magento\Backend\Model\View\Result\Page::moveBlockToContainer instead.',
- ];
-
- /**
- * @var string[]
- */
- private $obsoleteResponseWarningCodes = [
- 'loadLayout' => 'LoadLayoutResponseMethodFound',
- 'renderLayout' => 'RenderLayoutResponseMethodFound',
- '_redirect' => 'RedirectResponseMethodFound',
- '_forward' => 'ForwardResponseMethodFound',
- '_setActiveMenu' => 'SetActiveMenuResponseMethodFound',
- '_addBreadcrumb' => 'AddBreadcrumbResponseMethodFound',
- '_addContent' => 'AddContentResponseMethodFound',
- '_addLeft' => 'AddLeftResponseMethodFound',
- '_addJs' => 'AddJsResponseMethodFound',
- '_moveBlockToContainer' => 'MoveBlockToContainerResponseMethodFound',
- ];
-
- /**
- * @inheritdoc
- */
- public function register()
- {
- return [
- T_OBJECT_OPERATOR,
- T_FUNCTION
- ];
- }
-
- /**
- * @inheritDoc
- */
- public function process(File $phpcsFile, $stackPtr)
- {
- $tokens = $phpcsFile->getTokens();
- $stringPos = $phpcsFile->findNext(T_STRING, $stackPtr + 1);
-
- foreach ($this->obsoleteResponseMethods as $method => $errorMessage) {
- if ($tokens[$stringPos]['content'] === $method) {
- $phpcsFile->addWarning(
- sprintf('%s method is deprecated. %s', $method, $errorMessage),
- $stackPtr,
- $this->obsoleteResponseWarningCodes[$method]
- );
- }
- }
- }
-}
diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
deleted file mode 100644
index 4e33d0f7..00000000
--- a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-_view->loadLayout(['default', 'test'], true, true, false);
-$this->_view->renderLayout();
-
-protected function _addBreadcrumb($label, $title = null, $link = null)
-{
- $this->getLayout()->getBlock('test')->addLink($label, $title, $link);
-}
-
-$this->editPost = $objectManagerHelper->getObject(
- TestClass::class,
- [
- '_redirect' => $this->redirect,
- ]
-);
-
-$this->_redirect('test/path');
-
-$this->_forward('grid');
-
-$this->_initAction()->_setActiveMenu(
- 'Magento_Invitation::report_magento_invitation_order'
-)->_addBreadcrumb(
- __('Invitation Report by Customers'),
- __('Invitation Report by Order Conversion Rate')
-)->_addLeft(
-)->_addJs(
- $this->_view->getLayout()->createBlock(TestBlock::class)->setTemplate('Test::test.phtml')
-);
-
-private function _addContent(AbstractBlock $block)
-{
- return $this->_moveBlockToContainer($block, 'content');
-}
diff --git a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php b/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
deleted file mode 100644
index b35d43a1..00000000
--- a/Magento2/Tests/Legacy/ObsoleteResponseUnitTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 1,
- 8 => 1,
- 10 => 1,
- 22 => 1,
- 24 => 1,
- 26 => 1,
- 28 => 1,
- 31 => 1,
- 32 => 1,
- 36 => 1,
- 38 => 1
- ];
- }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 5efe99f5..ee171871 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,11 +350,7 @@
8
warning
-
- 8
- warning
-
-
+
7
diff --git a/composer.lock b/composer.lock
index 3742d05c..7820492e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -70,16 +70,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.5.4",
+ "version": "1.5.6",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b"
+ "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
- "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
+ "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1",
"shasum": ""
},
"require": {
@@ -105,7 +105,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.5.4"
+ "source": "https://github.com/phpstan/phpstan/tree/1.5.6"
},
"funding": [
{
@@ -125,25 +125,25 @@
"type": "tidelift"
}
],
- "time": "2022-04-03T12:39:00+00:00"
+ "time": "2022-04-15T11:13:37+00:00"
},
{
"name": "rector/rector",
- "version": "0.12.20",
+ "version": "0.12.21",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
- "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560"
+ "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/rectorphp/rector/zipball/cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
- "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
+ "url": "https://api.github.com/repos/rectorphp/rector/zipball/2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
+ "reference": "2fb3b1c1d85e784a55e5806cf50734e5aa872eb4",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0",
- "phpstan/phpstan": "^1.5"
+ "phpstan/phpstan": "^1.5.6"
},
"conflict": {
"phpstan/phpdoc-parser": "<1.2",
@@ -177,7 +177,7 @@
"description": "Instant Upgrade and Automated Refactoring of any PHP code",
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
- "source": "https://github.com/rectorphp/rector/tree/0.12.20"
+ "source": "https://github.com/rectorphp/rector/tree/0.12.21"
},
"funding": [
{
@@ -185,7 +185,7 @@
"type": "github"
}
],
- "time": "2022-04-06T12:55:14+00:00"
+ "time": "2022-04-18T12:12:41+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@@ -245,16 +245,16 @@
},
{
"name": "webonyx/graphql-php",
- "version": "v14.11.5",
+ "version": "v14.11.6",
"source": {
"type": "git",
"url": "https://github.com/webonyx/graphql-php.git",
- "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0"
+ "reference": "6070542725b61fc7d0654a8a9855303e5e157434"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ffa431c0821821839370a68dab3c2597c06bf7f0",
- "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0",
+ "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6070542725b61fc7d0654a8a9855303e5e157434",
+ "reference": "6070542725b61fc7d0654a8a9855303e5e157434",
"shasum": ""
},
"require": {
@@ -299,7 +299,7 @@
],
"support": {
"issues": "https://github.com/webonyx/graphql-php/issues",
- "source": "https://github.com/webonyx/graphql-php/tree/v14.11.5"
+ "source": "https://github.com/webonyx/graphql-php/tree/v14.11.6"
},
"funding": [
{
@@ -307,7 +307,7 @@
"type": "open_collective"
}
],
- "time": "2022-01-24T11:13:31+00:00"
+ "time": "2022-04-13T16:25:32+00:00"
}
],
"packages-dev": [
@@ -2421,5 +2421,5 @@
"ext-dom": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.2.0"
}