Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust composer 2 #10

Merged
merged 10 commits into from Jan 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .php_cs.dist
Expand Up @@ -9,6 +9,7 @@ return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'php_unit_method_casing' => false,
])
->setFinder($finder)
;
21 changes: 10 additions & 11 deletions .travis.yml
@@ -1,22 +1,21 @@
language: php
sudo: false

php:
- 7.1
- 7.2
- 7.3
- 7.4.7
- 7.4

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

before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- phpenv config-rm xdebug.ini || true
- composer validate
- composer self-update

install:
- composer install
- composer update

script:
- ./vendor/bin/phpunit;
Expand All @@ -26,15 +25,15 @@ jobs:
include:
- stage: Code Quality
name: Static analysis
php: 7.2
php: 7.4
install:
- composer global require --dev phpmetrics/phpmetrics ^2.6;
- composer global require --dev phpmetrics/phpmetrics ^2.6
script:
- ~/.composer/vendor/bin/phpmetrics --exclude=Exception src
- composer global exec -v -- phpmetrics --exclude=Exception src

- stage: Code Quality
name: Code Standards
php: 7.2
php: 7.4
install: composer global require --dev friendsofphp/php-cs-fixer ^2.0;
script:
- ~/.composer/vendor/bin/php-cs-fixer --dry-run -v fix;
- composer global exec -v -- php-cs-fixer --dry-run -v fix
25 changes: 12 additions & 13 deletions composer.json
@@ -1,8 +1,10 @@
{
"name": "kin29/dj-kin29",
"description": "Web Application for creating automatically Spotify playlist",
"type": "project",
"license": "proprietary",
"require": {
"php": "^7.1.3",
"php": "^7.4",
"ext-ctype": "*",
"ext-iconv": "*",
"jwilsson/spotify-web-api-php": "^3.1",
Expand All @@ -11,7 +13,7 @@
"symfony/apache-pack": "^1.0",
"symfony/asset": "4.4.*",
"symfony/console": "4.4.*",
"symfony/debug-pack": "*",
"symfony/debug-pack": "^1.0",
"symfony/dotenv": "4.4.*",
"symfony/expression-language": "4.4.*",
"symfony/flex": "^1.3.1",
Expand All @@ -22,25 +24,22 @@
"symfony/mailer": "4.4.*",
"symfony/maker-bundle": "^1.0",
"symfony/monolog-bundle": "^3.1",
"symfony/orm-pack": "*",
"symfony/orm-pack": "^2.0",
"symfony/process": "4.4.*",
"symfony/profiler-pack": "*",
"symfony/profiler-pack": "^1.0",
"symfony/security-bundle": "4.4.*",
"symfony/serializer-pack": "*",
"symfony/test-pack": "*",
"symfony/serializer-pack": "^1.0",
"symfony/test-pack": "^1.0",
"symfony/translation": "4.4.*",
"symfony/twig-pack": "*",
"symfony/twig-pack": "^1.0",
"symfony/validator": "4.4.*",
"symfony/web-link": "4.4.*",
"symfony/yaml": "4.4.*"
"symfony/yaml": "4.4.*",
"composer-plugin-api": "^1.0 || ^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
"phpmetrics/phpmetrics": "^2.6",
"symfony/debug-pack": "*",
"symfony/maker-bundle": "^1.0",
"symfony/profiler-pack": "*",
"symfony/test-pack": "*"
"phpmetrics/phpmetrics": "^2.6"
},
"config": {
"preferred-install": {
Expand Down