From e76337a88714f00c2b4a85125d4cd674453539b2 Mon Sep 17 00:00:00 2001 From: Lars Roettig Date: Wed, 20 Mar 2019 21:24:45 +0100 Subject: [PATCH] #67: Remove Magento2.Exceptions.Namespace --- Magento2/Sniffs/Exceptions/NamespaceSniff.php | 64 ------------------- .../Tests/Exceptions/NamespaceUnitTest.inc | 62 ------------------ .../Tests/Exceptions/NamespaceUnitTest.php | 35 ---------- Magento2/ruleset.xml | 4 -- 4 files changed, 165 deletions(-) delete mode 100644 Magento2/Sniffs/Exceptions/NamespaceSniff.php delete mode 100644 Magento2/Tests/Exceptions/NamespaceUnitTest.inc delete mode 100644 Magento2/Tests/Exceptions/NamespaceUnitTest.php diff --git a/Magento2/Sniffs/Exceptions/NamespaceSniff.php b/Magento2/Sniffs/Exceptions/NamespaceSniff.php deleted file mode 100644 index 463fb43d..00000000 --- a/Magento2/Sniffs/Exceptions/NamespaceSniff.php +++ /dev/null @@ -1,64 +0,0 @@ -findNext(T_NAMESPACE, 0) === false) { - return; - } - - $tokens = $phpcsFile->getTokens(); - $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr); - $posOfExceptionClassName = $phpcsFile->findNext(T_STRING, $stackPtr, $endOfStatement); - $posOfNsSeparator = $phpcsFile->findNext(T_NS_SEPARATOR, $stackPtr, $posOfExceptionClassName); - if ($posOfNsSeparator === false && $posOfExceptionClassName !== false) { - $exceptionClassName = trim($tokens[$posOfExceptionClassName]['content']); - $posOfClassInUse = $phpcsFile->findNext(T_STRING, 0, $stackPtr, false, $exceptionClassName); - if ($posOfClassInUse === false || $tokens[$posOfClassInUse]['level'] != 0) { - $phpcsFile->addWarning( - $this->errorMessage, - $stackPtr, - $this->errorCode, - $exceptionClassName - ); - } - } - } -} diff --git a/Magento2/Tests/Exceptions/NamespaceUnitTest.inc b/Magento2/Tests/Exceptions/NamespaceUnitTest.inc deleted file mode 100644 index c67f4569..00000000 --- a/Magento2/Tests/Exceptions/NamespaceUnitTest.inc +++ /dev/null @@ -1,62 +0,0 @@ -setAuth($ch); - try { - switch (strtoupper($this->verb)) { - case 'GET': - $this->executeGet($ch); - break; - case 'POST': - $this->executePost($ch); - break; - case 'PUT': - $this->executePut($ch); - break; - case 'DELETE': - $this->executeDelete($ch); - break; - default: - throw new \InvalidArgumentException( - 'Current verb (' . $this->verb - . ') is an invalid REST verb.' - ); - } - } catch (InvalidArgumentException $e) { - curl_close($ch); - throw $e; - } catch (\Exception $e) { - curl_close($ch); - throw $e; - } - } -} - -try { - doSomethind(); -} catch (\Exception $e) { - logException($e->getMessage()); -} diff --git a/Magento2/Tests/Exceptions/NamespaceUnitTest.php b/Magento2/Tests/Exceptions/NamespaceUnitTest.php deleted file mode 100644 index 9b39575b..00000000 --- a/Magento2/Tests/Exceptions/NamespaceUnitTest.php +++ /dev/null @@ -1,35 +0,0 @@ - 1, - 10 => 1, - 48 => 1, - ]; - } -} diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml index 6cf09ab7..e23cf5ce 100644 --- a/Magento2/ruleset.xml +++ b/Magento2/ruleset.xml @@ -214,10 +214,6 @@ 7 warning - - 7 - warning - 7 warning