Skip to content

Commit

Permalink
Merge pull request #182 from spryker-shop/internal-release-update
Browse files Browse the repository at this point in the history
Internal release update
  • Loading branch information
DmitryLymarenko authored Jul 27, 2023
2 parents 7540601 + 1a170f6 commit 50b53a7
Show file tree
Hide file tree
Showing 145 changed files with 3,096 additions and 2,524 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
run: vendor/bin/phpmd src/ text vendor/spryker/architecture-sniffer/src/ruleset.xml --minimumpriority 2

- name: Run PHPStan
run: vendor/bin/phpstan analyze -l 5 -c phpstan.neon src/
run: vendor/bin/phpstan analyze -l 6 -c phpstan.neon src/

- name: Run Evaluator
run: vendor/bin/evaluator evaluate
Expand Down
17 changes: 10 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ FOSS.md

/data/*
!/data/import/
!/data/translation/
!/data/export
!/data/export/
/data/export/merchants/*

# grunt stuff
.grunt
Expand All @@ -47,11 +47,10 @@ config/Yves/cache_bust.php
/node_modules/

# public stuff
/public/*/assets/
/public/*/dist/
public/*/assets/
public/Configurator/dist/

# docker stuff
/docker/
/.docker-sync/
/.unison*
/deploy.local.yml
Expand Down Expand Up @@ -84,18 +83,22 @@ npm-debug.log
/src/Orm/Propel/Sql
/src/Orm/Propel/Migration_pgsql/
/src/Orm/Propel/Migration_mysql/
/src/Orm/Propel/generated-conf/

# tools
composer.phar
c3.php
.phpstorm.meta.php
.githook_local
/architecture-baseline.json

# Yarn
.yarn/*
!.yarn/releases/
!.yarn/plugins/

# Docker
docker

# angular
/.angular/
/.angular/cache
/.angular
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Ignore paths
/.angular/
/.github/
/.angular/
/.idea/
/docker/
/vendor/
/public/*/assets/
/public/*/assets/**
**/dist/**
/src/Generated/
/src/Orm/Propel/Schema/
Expand Down
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@spryker/frontend-config.prettier/.prettierrc.json');
5 changes: 1 addition & 4 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
build:
environment:
php: '8.0.19'
node: '14.0'

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

dependencies:
override:
- true

nodes:
analysis:
tests:
Expand Down
315 changes: 156 additions & 159 deletions composer.json

Large diffs are not rendered by default.

Loading

0 comments on commit 50b53a7

Please sign in to comment.