Benzine/Core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup.

Browse source
This commit is contained in:
Greyscale 2021-05-16 06:27:21 +02:00
parent 3475d16908
commit a942a6d56a
4 changed files with 10 additions and 9 deletions

2
.php_cs → .php-cs-fixer.php
View file

@ -37,7 +37,7 @@ if (file_exists(__PHPCS_ROOT__.'/vendor/benzine')) {
} }
} }
return PhpCsFixer\Config::create() return (new PhpCsFixer\Config)
->setRiskyAllowed(true) ->setRiskyAllowed(true)
->setHideProgress(false) ->setHideProgress(false)
->setRules([ ->setRules([

8
composer.json
View file

@ -65,13 +65,13 @@
"symfony/twig-bridge": "^5.1", "symfony/twig-bridge": "^5.1",
"symfony/yaml": "^5.1", "symfony/yaml": "^5.1",
"tuupola/server-timing-middleware": "^0.9", "tuupola/server-timing-middleware": "^0.9",
"twig/extensions":"^1.3", "twig/intl-extra": "^3.0",
"twig/intl-extra": "^3.0" "twig/twig": "^3.0"
}, },
"require-dev": { "require-dev": {
"benzine/orm": "dev-master", "benzine/orm": "dev-master",
"brainmaestro/composer-git-hooks": "^2.8", "brainmaestro/composer-git-hooks": "^2.8",
"brianium/paratest": "^4.1", "brianium/paratest": "^6.0",
"clue/commander": "^v1.3.0", "clue/commander": "^v1.3.0",
"jc21/clitable": "^1.2", "jc21/clitable": "^1.2",
"johnkary/phpunit-speedtrap": "^3.0.0", "johnkary/phpunit-speedtrap": "^3.0.0",
@ -80,7 +80,6 @@
"phpstan/phpstan-deprecation-rules": "^0.12", "phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12.16", "phpstan/phpstan-phpunit": "^0.12.16",
"phpstan/phpstan-symfony": "^0.12", "phpstan/phpstan-symfony": "^0.12",
"phpunit/phpcov": "^7.0",
"phpunit/phpunit": "^9.2", "phpunit/phpunit": "^9.2",
"slam/phpstan-extensions": "^5.0", "slam/phpstan-extensions": "^5.0",
"thecodingmachine/phpstan-strict-rules": "^0.12", "thecodingmachine/phpstan-strict-rules": "^0.12",
@ -107,6 +106,7 @@
"docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app" "docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app"
], ],
"pre-push": [ "pre-push": [
"composer install",
"docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app", "docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app",
"vendor/bin/phpstan analyse" "vendor/bin/phpstan analyse"
], ],

3
phinx.php
View file

@ -1,5 +1,6 @@
<?php <?php
require_once(__DIR__ . "/bin/find-autoloader.php");
require_once __DIR__.'/bin/find-autoloader.php';
$app = require VENDOR_PATH.'/../bootstrap.php'; $app = require VENDOR_PATH.'/../bootstrap.php';
use Benzine\ORM; use Benzine\ORM;

6
src/Services/ConfigurationService.php
View file

@ -120,9 +120,9 @@ class ConfigurationService
$this->configNotFoundInPaths = array_unique($this->configNotFoundInPaths); $this->configNotFoundInPaths = array_unique($this->configNotFoundInPaths);
throw new BenzineConfigurationException(sprintf( throw new BenzineConfigurationException(sprintf(
'Cannot find .benzine.yml in any of the following locations: %s', 'Cannot find .benzine.yml in any of the following locations: %s',
implode(', ', $this->configNotFoundInPaths) implode(', ', $this->configNotFoundInPaths)
)); ));
} }
$this->parseFile($path.'/.benzine.yml'); $this->parseFile($path.'/.benzine.yml');