diff --git a/.php_cs b/.php_cs index c7f43f02f4fc521b53bf797e30a3cc5d3e3f2821..5bd1a01537611de83ce9e9a8bb4bae01da274a9f 100644 --- a/.php_cs +++ b/.php_cs @@ -33,7 +33,6 @@ return Symfony\CS\Config\Config::create() 'extra_empty_lines', 'include', 'join_function', - 'multiline_array_trailing_comma', 'namespace_no_leading_whitespace', 'new_with_braces', 'object_operator', diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php index 8fcd455ae4b683d753e119f083f5520f514a67d1..a90ab7b633dc2c791b39594258740a457e4fbc31 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php @@ -162,9 +162,7 @@ class StaticProperties $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/'; $classPattern = '/\nclass [a-zA-Z0-9_]+/'; foreach ($classFiles as $classFile) { - $file = @fopen($classFile, 'r'); - $code = fread($file, 4096); - fclose($file); + $code = file_get_contents($classFile); preg_match($namespacePattern, $code, $namespace); preg_match($classPattern, $code, $class); if (!isset($namespace[0]) || !isset($class[0])) { diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php index 5ae92ced70ec94cae4f34e9671e42218cfc28eff..90f99228096987ae3af53db0c632058a05efd276 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php @@ -107,7 +107,7 @@ class ConfigurableTest extends AbstractProductExportImportTestCase */ public function testImportReplace($fixtures, $skus, $skippedAttributes = []) { - $this->markTestSkipped('MAGETWO-56530s'); + $this->markTestSkipped('MAGETWO-56530'); parent::testImportReplace($fixtures, $skus, $skippedAttributes); }