Skip to content

Commit

Permalink
Merge pull request #68 from spryker-shop/march2019release
Browse files Browse the repository at this point in the history
March 2019 release
  • Loading branch information
vlunov-spryker committed Mar 15, 2019
2 parents 17628a3 + 3af19eb commit d5e9579
Show file tree
Hide file tree
Showing 278 changed files with 11,954 additions and 7,999 deletions.
4 changes: 3 additions & 1 deletion .githook
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
config:
phpstan:
level: 1
level: 4
config: phpstan.neon
additionalDirectories:
- tests/
architecture:
priority: 2

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ config/accumulated-config.json
/src/Generated/
/vendor/
FOSS.md
/public/Yves/maintenance/maintenance.marker
/public/Zed/maintenance/maintenance.marker

/data/*
!/data/import/
Expand Down
12 changes: 6 additions & 6 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
build:
environment:
php: '7.1'
node: '8.10.0'
dependencies:
before:
- 'rm -rf ./node_modules'
- 'npm cache -f clear'
- 'composer remove --dev spryker/git-hook'

tests:
override:
- true # disable test execution on scrutinizer

nodes:
analysis:
tests:
override:
- php-scrutinizer-run
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ sudo: required

before_install:
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- phpenv config-rm xdebug.ini
- if [[ $DB == 'mysql' ]]; then chmod +x ./config/Shared/ci/travis/mysql/* ; fi
- if [[ $DB == 'mysql' ]]; then ./config/Shared/ci/travis/mysql/travis_mysql_5.7.sh ; fi
- ( awk '1;/@hook travis-ci/{exit}' config/Shared/stores.php ; awk 'NR>1' config/Shared/ci/travis/stores.php ; awk '/@hook travis-ci/,0' config/Shared/stores.php ) > config/Shared/stores_tmp.php ; mv config/Shared/stores_tmp.php config/Shared/stores.php
Expand All @@ -63,6 +64,8 @@ before_script:
- mkdir -p data/DE/cache/Zed/twig -m 0777
- mkdir -p data/DE/logs -m 0777
- chmod -R 777 data/
- chmod -R 660 config/Zed/dev_only_private.key
- chmod -R 660 config/Zed/dev_only_public.key

- if [[ -z $DB ]] ; then cat config/Shared/ci/travis/postgresql_ci.config >> config/Shared/ci/travis/config_ci.php ; fi
- if [[ $DB == 'mysql' ]] ; then cat config/Shared/ci/travis/mysql_ci.config >> config/Shared/ci/travis/config_ci.php ; fi
Expand All @@ -87,14 +90,15 @@ before_script:
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/console frontend:yves:install-dependencies ; fi

script:
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/phpstan analyze -c phpstan.neon src/ -l 2 ; fi
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/phpstan analyze -c phpstan.neon src/ -l 4 ; fi

- if [[ $VALIDATION == 1 ]] ; then vendor/bin/console propel:schema:validate ; fi
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/console propel:schema:validate-xml-names ; fi
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/console transfer:validate ; fi
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/console code:sniff:style ; fi
- if [[ $VALIDATION == 1 ]] ; then vendor/bin/phpmd src/ text vendor/spryker/architecture-sniffer/src/ruleset.xml --minimumpriority 2 ; fi

- vendor/bin/phantomjs --webdriver=4444 &

- if [[ $TEST_GROUP == 'without-acceptance' ]] ; then vendor/bin/codecept run -x Presentation ; fi
- if [[ $TEST_GROUP == 'acceptance' ]] ; then vendor/bin/codecept run -g Presentation ; fi

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Spryker B2C Demo Shop
[![Build Status](https://travis-ci.org/spryker-shop/b2c-demo-shop.svg?branch=master)](https://travis-ci.org/spryker-shop/b2c-demo-shop)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg)](https://php.net/)

## Installation
Expand Down
Loading

0 comments on commit d5e9579

Please sign in to comment.