From a942a6d56ad1e38c8048ef5e440408175da2519d Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sun, 16 May 2021 06:27:21 +0200
Subject: [PATCH] Fixup.
---
.php_cs => .php-cs-fixer.php | 2 +-
composer.json | 8 ++++----
phinx.php | 3 ++-
src/Services/ConfigurationService.php | 6 +++---
4 files changed, 10 insertions(+), 9 deletions(-)
rename .php_cs => .php-cs-fixer.php (97%)
diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 97%
rename from .php_cs
rename to .php-cs-fixer.php
index aa08db3..b10666a 100644
--- a/.php_cs
+++ b/.php-cs-fixer.php
@@ -37,7 +37,7 @@ if (file_exists(__PHPCS_ROOT__.'/vendor/benzine')) {
}
}
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
->setRiskyAllowed(true)
->setHideProgress(false)
->setRules([
diff --git a/composer.json b/composer.json
index 706afe6..0fbd2aa 100644
--- a/composer.json
+++ b/composer.json
@@ -65,13 +65,13 @@
"symfony/twig-bridge": "^5.1",
"symfony/yaml": "^5.1",
"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": {
"benzine/orm": "dev-master",
"brainmaestro/composer-git-hooks": "^2.8",
- "brianium/paratest": "^4.1",
+ "brianium/paratest": "^6.0",
"clue/commander": "^v1.3.0",
"jc21/clitable": "^1.2",
"johnkary/phpunit-speedtrap": "^3.0.0",
@@ -80,7 +80,6 @@
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12.16",
"phpstan/phpstan-symfony": "^0.12",
- "phpunit/phpcov": "^7.0",
"phpunit/phpunit": "^9.2",
"slam/phpstan-extensions": "^5.0",
"thecodingmachine/phpstan-strict-rules": "^0.12",
@@ -107,6 +106,7 @@
"docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app"
],
"pre-push": [
+ "composer install",
"docker run --rm -i -v $(pwd):/app cytopia/php-cs-fixer:latest fix /app",
"vendor/bin/phpstan analyse"
],
diff --git a/phinx.php b/phinx.php
index d50e220..0763045 100644
--- a/phinx.php
+++ b/phinx.php
@@ -1,5 +1,6 @@
<?php
-require_once(__DIR__ . "/bin/find-autoloader.php");
+
+require_once __DIR__.'/bin/find-autoloader.php';
$app = require VENDOR_PATH.'/../bootstrap.php';
use Benzine\ORM;
diff --git a/src/Services/ConfigurationService.php b/src/Services/ConfigurationService.php
index 59a8901..6625606 100644
--- a/src/Services/ConfigurationService.php
+++ b/src/Services/ConfigurationService.php
@@ -120,9 +120,9 @@ class ConfigurationService
$this->configNotFoundInPaths = array_unique($this->configNotFoundInPaths);
throw new BenzineConfigurationException(sprintf(
- 'Cannot find .benzine.yml in any of the following locations: %s',
- implode(', ', $this->configNotFoundInPaths)
- ));
+ 'Cannot find .benzine.yml in any of the following locations: %s',
+ implode(', ', $this->configNotFoundInPaths)
+ ));
}
$this->parseFile($path.'/.benzine.yml');