Merge remote-tracking branch 'origin/master' into bugfix/cc-7652-product-attributes-saving

Author: AsonUnique

.gitattributes

@@ -1,6 +1,6 @@
+# Define the line ending behavior of the different file extensions
 # Set the default behavior, in case people don't have core.autocrlf set.
-* eol=lf
-* text=auto
+* text text=auto eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary
@@ -23,9 +23,11 @@
 # Remove files for archives generated using `git archive`
 codeception.yml export-ignore
 dependency.json export-ignore
+phpstan.json export-ignore
+phpstan.neon export-ignore
+tooling.yml export-ignore
 .coveralls.yml export-ignore
 .travis.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-tooling.yml export-ignore

.gitignore

@@ -1,19 +1,36 @@
-# IDEs
-/.idea
-/.project
-/nbproject
-/.buildpath
-/.settings
+# IDE
+.idea/
+.project/
+nbproject/
+.buildpath/
+.settings/
 *.sublime-*
+
+# OS
+.DS_Store
 *.AppleDouble
 *.AppleDB
 *.AppleDesktop
 
-# OS
-.DS_Store
+# grunt stuff
+.grunt
+.sass-cache
+/node_modules/
+
+# tooling
+vendor/
+composer.lock
+.phpunit.result.cache
+
+# built client resources
+src/*/Zed/*/Static/Public
+src/*/Zed/*/Static/Assets/sprite
 
-/vendor
-/composer.lock
+# Propel classes
+src/*/Zed/*/Persistence/Propel/Base/*
+src/*/Zed/*/Persistence/Propel/Map/*
 
-/tests/_output/*
-!/tests/_output/.gitkeep
+# tests
+tests/**/_generated/
+tests/_output/*
+!tests/_output/.gitkeep

.travis.yml

@@ -21,11 +21,14 @@ before_install:
 
 install:
     - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction
-    - if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi
+    - if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction ; fi
+    - if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer require --dev dereuromark/composer-prefer-lowest; fi
 
 script:
     - find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )
 
+    - if [[ $PREFER_LOWEST == 1 ]]; then vendor/bin/validate-prefer-lowest || true; fi
+
 cache:
     directories:
         - $HOME/.composer/cache/

README.md

@@ -1,4 +1,6 @@
 # ProductAttributeGui Module
+[![Build Status](https://travis-ci.org/spryker/product-attribute-gui.svg)](https://travis-ci.org/spryker/product-attribute-gui)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)
 
 ProductAttributeGui is a user interface module to manage product attributes in the Zed Administration Interface.
 

composer.json

@@ -15,6 +15,7 @@
   },
   "require-dev": {
     "spryker/application": "*",
+    "spryker/code-sniffer": "*",
     "spryker/propel": "*",
     "spryker/testify": "*",
     "spryker/zed-navigation": "*"
@@ -31,6 +32,10 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
+  "scripts": {
+    "cs-check": "phpcs -p -s --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/ tests/",
+    "cs-fix": "phpcbf -p --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/ tests/"
+  },
   "extra": {
     "branch-alias": {
       "dev-master": "1.0.x-dev"