Merged in feature/PD-653 (pull request #4)

1.1.0 Require stable version of coding standard, refer to testing suite in readme Approved-by: Michiel Brunsting <[email protected]> Approved-by: Jan-Marten de Boer <[email protected]>
mediact · Nov 6, 2017 · 2228b20 · 2228b20
2 parents 5b01e3a + 88980c8
commit 2228b20
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -24,15 +24,17 @@ root of the project.
 </ruleset>
 ```
 
-# Integration with PHPStorm
+# Integration with PHPStorm and automatic testing
 
-When the phpcs.xml file exists it will be automatically configured by
-`media/coding-standard-phpstorm`. This is triggered by the composer command.
+The recommended way to enable the coding standard in PHPStorm and automatic
+testing is by requiring the MediaCT testing suite in a project.
 
 ```shell
-$ composer install
+$ composer require --dev mediact/testing-suite
 ```
 
+For more information go to [MediaCT Testing Suite](https://github.com/mediact/testing-suite).
+
 # Contribution guidelines
 
 Contributions are welcome. Please create pull requests which add or remove

diff --git a/composer.json b/composer.json
@@ -1,34 +1,27 @@
 {
-  "name": "mediact/coding-standard-magento1",
-  "description": "MediaCT PHP Coding Standard for Magento1",
-  "type": "phpcs-sniffs",
-  "homepage": "https://bitbucket.org/mediactbv/coding-standard-magento1",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "MediaCT",
-      "email": "[email protected]"
+    "name": "mediact/coding-standard-magento1",
+    "description": "MediaCT PHP Coding Standard for Magento1",
+    "type": "phpcs-sniffs",
+    "homepage": "https://bitbucket.org/mediactbv/coding-standard-magento1",
+    "license": "proprietary",
+    "authors": [
+        {
+            "name": "MediaCT",
+            "email": "[email protected]"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://composer.mediact.nl"
+        },
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com"
+        }
+    ],
+    "require": {
+        "magento/marketplace-eqp": "^1.0",
+        "mediact/coding-standard": "@stable"
     }
-  ],
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "https://composer.mediact.nl"
-    },
-    {
-      "type": "composer",
-      "url": "https://repo.magento.com"
-    }
-  ],
-  "require": {
-    "php": "^5.4.0 || ^7.0",
-    "mediact/coding-standard": "^1.0",
-    "squizlabs/php_codesniffer": "^2.0",
-    "magento/marketplace-eqp": "^1.0"
-  },
-  "autoload": {
-    "psr-0": {
-      "MediactMagento1": "src/MediactMagento1"
-    }
-  }
-}
+}