Skip to content

Commit

Permalink
Merge branch 'master' into feature/ps-11507/ps-11509/dev-shopping-lis…
Browse files Browse the repository at this point in the history
…t-functionality
  • Loading branch information
Dmitry Lymarenko committed Dec 21, 2019
2 parents fc9eba7 + 099f1dd commit bde7859
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 31 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at https://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.bat]
end_of_line = crlf

[composer.json]
indent_size = 2
10 changes: 5 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,11 +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
phpstan.neon
phpstan.json
41 changes: 29 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
30 changes: 19 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
language: php
dist: trusty

php:
- 7.2
- 7.3
- 7.4

cache:
directories:
- vendor
- $HOME/.composer/cache
matrix:
fast_finish: true

include:
- php: 7.2
env: PREFER_LOWEST=1

env:
global:
- APPLICATION_ENV=development
- APPLICATION_STORE=DE

before_install:
- phpenv config-rm xdebug.ini

install:
- composer install --no-interaction --prefer-dist
- COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction
- 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:
- vendor/bin/phpcs src --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml
- vendor/bin/codecept run --env isolated --coverage-xml
- find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )

after_success:
- vendor/bin/coveralls -vvv
- if [[ $PREFER_LOWEST == 1 ]]; then vendor/bin/validate-prefer-lowest || true; fi

cache:
directories:
- $HOME/.composer/cache/

notifications:
email: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# QuickOrderPage Module
[![Build Status](https://travis-ci.org/spryker-shop/quick-order-page.svg)](https://travis-ci.org/spryker-shop/quick-order-page)
[![Coverage Status](https://coveralls.io/repos/github/spryker-shop/quick-order-page/badge.svg)](https://coveralls.io/github/spryker-shop/quick-order-page)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)

This module contains page with Quick Order Form, from which the customer can quickly find products by SKU, name, etc. and add them to the Cart or directly create new order.

Expand Down
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"require-dev": {
"spryker/code-sniffer": "*",
"spryker/router": "*",
"spryker/silex": "*",
"spryker/testify": "*"
"spryker/silex": "*"
},
"suggest": {
"spryker/router": "If you want to use RouteProviderPlugins to be added to the Route Module.",
Expand All @@ -39,6 +38,10 @@
},
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"cs-check": "phpcs -p -s --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/",
"cs-fix": "phpcbf -p --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/"
},
"extra": {
"branch-alias": {
"dev-master": "4.0.x-dev"
Expand Down

0 comments on commit bde7859

Please sign in to comment.