FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fixing cs fixer config · php-enqueue/enqueue-dev@40e8af9 · GitHub

/ enqueue-dev Public

Commit 40e8af9

Browse files
JimTools
committed
Fixing cs fixer config
Changing php-cs-fixer config filename to the default so it's detected without having to specify the config flag
1 parent 4dbdbb5 commit 40e8af9

8 files changed

Lines changed: 22 additions & 21 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
- run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
7171

72-
- run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
72+
- run: ./bin/php-cs-fixer fix --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
7373
if: env.GIT_DIFF_FILTERED
7474

7575
unit_tests:

‎.gitignore‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
*~
22
/.idea/
33
bin/doctrine*
4-
bin/php-cs-fixer
5-
bin/phpunit
6-
bin/sql-formatter
7-
bin/phpstan
8-
bin/jp.php
9-
bin/php-parse
10-
bin/google-cloud-batch
4+
bin/php-cs-fixer*
5+
bin/phpunit*
6+
bin/sql-formatter*
7+
bin/phpstan*
8+
bin/jp.php*
9+
bin/php-parse*
10+
bin/google-cloud-batch*
11+
bin/patch-type-declarations*
1112
bin/thruway
12-
bin/phpstan.phar
13-
bin/var-dump-server
14-
bin/yaml-lint
13+
bin/var-dump-server*
14+
bin/yaml-lint*
1515
vendor
1616
var
1717
.php_cs
1818
.php_cs.cache
1919
composer.lock
2020
.phpunit.result.cache
21+
.php-cs-fixer.cache

.php_cs.php renamed to .php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
return (new PhpCsFixer\Config())
4+
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
45
->setRiskyAllowed(true)
56
->setRules(array(
67
'@Symfony' => true,

‎bin/fix-symfony-version.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

33
if (empty($argv[1])) {
4-
throw new \LogicException('The new symfony version must be provided');
4+
throw new LogicException('The new symfony version must be provided');
55
}
66

77
$newVersion = $argv[1];
88

99
$composer = file_get_contents(__DIR__.'/../composer.json');
1010

11-
$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).PHP_EOL;
12-
echo $updatedComposer.PHP_EOL;
11+
$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).\PHP_EOL;
12+
echo $updatedComposer.\PHP_EOL;
1313

1414
file_put_contents(__DIR__.'/../composer.json', $updatedComposer);

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"minimum-stability": "beta",
55
"homepage": "https://enqueue.forma-pro.com/",
66
"scripts": {
7-
"cs-fix": "bin/php-cs-fixer fix --config=.php_cs.php",
8-
"cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff",
7+
"cs-fix": "bin/php-cs-fixer fix",
8+
"cs-lint": "bin/php-cs-fixer fix --no-interaction --dry-run --diff",
99
"phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
1010
},
1111
"require": {
@@ -136,4 +136,3 @@
136136
}
137137
}
138138
}
139-

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
build:
88
context: docker
99
args:
10-
PHP_VERSION: "${PHP_VERSION:-7.4}"
10+
PHP_VERSION: "${PHP_VERSION:-8.1}"
1111
depends_on:
1212
- rabbitmq
1313
- mysql

‎docker/bin/refresh-mysql-database.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
require_once getcwd().'/vendor/autoload.php';
66

77
$dsn = getenv('DOCTRINE_DSN');
8-
$database = trim(parse_url($dsn, PHP_URL_PATH), '/');
8+
$database = trim(parse_url($dsn, \PHP_URL_PATH), '/');
99

1010
$dbalContext = (new DbalConnectionFactory($dsn))->createContext();
1111

1212
$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase($database);
1313
$dbalContext->getDbalConnection()->exec('USE '.$database);
1414
$dbalContext->createDataBaseTable();
1515

16-
echo 'MySQL Database is updated'.PHP_EOL;
16+
echo 'MySQL Database is updated'.\PHP_EOL;

‎docker/bin/refresh-postgres-database.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase('postgres');
1212
$dbalContext->createDataBaseTable();
1313

14-
echo 'Postgresql Database is updated'.PHP_EOL;
14+
echo 'Postgresql Database is updated'.\PHP_EOL;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL