From d9382954bc859492f793180c7c82717fa2046397 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Tue, 1 Sep 2020 05:15:02 +0200 Subject: [PATCH] Make phpstan happier --- src/Controllers/{Controller.php => AbstractController.php} | 2 +- .../{CrudController.php => AbstractCrudController.php} | 2 +- .../{HtmlController.php => AbstractHTMLController.php} | 2 +- src/Exceptions/WorkerException.php | 7 +++++++ .../Lua/{LuaExtension.php => AbstractLuaExtension.php} | 2 +- src/Redis/Lua/SetIfHigher.php | 2 +- src/Redis/Lua/SetIfLower.php | 2 +- src/Redis/Lua/ZAddIfHigher.php | 2 +- src/Redis/Lua/ZAddIfLower.php | 2 +- src/Redis/Redis.php | 2 +- src/Router/Router.php | 2 +- src/Services/ConfigurationService.php | 4 +++- src/Twig/Extensions/InflectionExtension.php | 4 ++-- src/Twig/Extensions/TransformExtension.php | 2 +- ...ForeverLoopWorker.php => AbstractForeverLoopWorker.php} | 4 ++-- src/Workers/WorkerWorkItem.php | 3 ++- tests/{BaseTestCase.php => AbstractBaseTestCase.php} | 3 +-- tests/{RoutesTestCase.php => AbstractRoutesTestCase.php} | 2 +- .../{SeleniumTestCase.php => AbstractSeleniumTestCase.php} | 2 +- tests/{TestCase.php => AbstractTestCase.php} | 4 +++- 20 files changed, 33 insertions(+), 22 deletions(-) rename src/Controllers/{Controller.php => AbstractController.php} (98%) rename src/Controllers/{CrudController.php => AbstractCrudController.php} (98%) rename src/Controllers/{HtmlController.php => AbstractHTMLController.php} (96%) create mode 100644 src/Exceptions/WorkerException.php rename src/Redis/Lua/{LuaExtension.php => AbstractLuaExtension.php} (96%) rename src/Workers/{ForeverLoopWorker.php => AbstractForeverLoopWorker.php} (67%) rename tests/{BaseTestCase.php => AbstractBaseTestCase.php} (97%) rename tests/{RoutesTestCase.php => AbstractRoutesTestCase.php} (93%) rename tests/{SeleniumTestCase.php => AbstractSeleniumTestCase.php} (94%) rename tests/{TestCase.php => AbstractTestCase.php} (94%) diff --git a/src/Controllers/Controller.php b/src/Controllers/AbstractController.php similarity index 98% rename from src/Controllers/Controller.php rename to src/Controllers/AbstractController.php index 0a082a1..295816e 100644 --- a/src/Controllers/Controller.php +++ b/src/Controllers/AbstractController.php @@ -9,7 +9,7 @@ use Monolog\Logger; use Slim\Psr7\Request; use Slim\Psr7\Response; -abstract class Controller +abstract class AbstractController { protected Logger $logger; protected AbstractService $service; diff --git a/src/Controllers/CrudController.php b/src/Controllers/AbstractCrudController.php similarity index 98% rename from src/Controllers/CrudController.php rename to src/Controllers/AbstractCrudController.php index 3d46e69..60cb12b 100644 --- a/src/Controllers/CrudController.php +++ b/src/Controllers/AbstractCrudController.php @@ -7,7 +7,7 @@ use Laminas\Db\Adapter\Exception\InvalidQueryException; use Slim\Psr7\Request; use Slim\Psr7\Response; -abstract class CrudController extends Controller +abstract class AbstractCrudController extends AbstractController { public function listRequest(Request $request, Response $response): Response { diff --git a/src/Controllers/HtmlController.php b/src/Controllers/AbstractHTMLController.php similarity index 96% rename from src/Controllers/HtmlController.php rename to src/Controllers/AbstractHTMLController.php index fa85c59..8cfb295 100644 --- a/src/Controllers/HtmlController.php +++ b/src/Controllers/AbstractHTMLController.php @@ -8,7 +8,7 @@ use Slim\Psr7\Request; use Slim\Psr7\Response; use Slim\Views\Twig; -abstract class HtmlController extends Controller +abstract class AbstractHTMLController extends AbstractController { protected Twig $twig; protected DebugBar $debugBar; diff --git a/src/Exceptions/WorkerException.php b/src/Exceptions/WorkerException.php new file mode 100644 index 0000000..1de397f --- /dev/null +++ b/src/Exceptions/WorkerException.php @@ -0,0 +1,7 @@ +logger = $logger; $this->cachePoolChain = $cachePoolChain; diff --git a/src/Services/ConfigurationService.php b/src/Services/ConfigurationService.php index 906d7a6..173cb37 100644 --- a/src/Services/ConfigurationService.php +++ b/src/Services/ConfigurationService.php @@ -3,6 +3,7 @@ namespace Benzine\Services; use Benzine\App; +use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Yaml\Yaml; class ConfigurationService @@ -103,7 +104,8 @@ class ConfigurationService $path = getcwd(); //$path = dirname($this->environmentService->get('SCRIPT_FILENAME')); } - if (!file_exists($path.'/.benzine.yml')) { + + if (!(new Filesystem())->exists($path.'/.benzine.yml')) { $currentDirElem = explode(DIRECTORY_SEPARATOR, $path); array_pop($currentDirElem); $parentPath = implode(DIRECTORY_SEPARATOR, $currentDirElem); diff --git a/src/Twig/Extensions/InflectionExtension.php b/src/Twig/Extensions/InflectionExtension.php index 224c4fd..6d22f4a 100644 --- a/src/Twig/Extensions/InflectionExtension.php +++ b/src/Twig/Extensions/InflectionExtension.php @@ -11,10 +11,10 @@ class InflectionExtension extends AbstractExtension public function getFilters() { $filters = []; - $filters['pluralize'] = new TwigFilter('pluralize', function ($word) { + $filters['pluralize'] = new TwigFilter('pluralize', function ($word): string { return Inflect::pluralize($word); }); - $filters['singularize'] = new TwigFilter('singularize', function ($word) { + $filters['singularize'] = new TwigFilter('singularize', function ($word): string { return Inflect::singularize($word); }); diff --git a/src/Twig/Extensions/TransformExtension.php b/src/Twig/Extensions/TransformExtension.php index c3b46fb..16745a9 100644 --- a/src/Twig/Extensions/TransformExtension.php +++ b/src/Twig/Extensions/TransformExtension.php @@ -25,7 +25,7 @@ class TransformExtension extends AbstractExtension $name = 'transform_'.strtolower($fromTransformer).'_to_'.strtolower($toTransformer); $context = $this; $filters[$name] = - new TwigFilter($name, function ($word) use ($context, $fromTransformer, $toTransformer) { + new TwigFilter($name, function (string $word) use ($context, $fromTransformer, $toTransformer): string { return $context->transform($word, $fromTransformer, $toTransformer); }); } diff --git a/src/Workers/ForeverLoopWorker.php b/src/Workers/AbstractForeverLoopWorker.php similarity index 67% rename from src/Workers/ForeverLoopWorker.php rename to src/Workers/AbstractForeverLoopWorker.php index 35c164a..9d45450 100644 --- a/src/Workers/ForeverLoopWorker.php +++ b/src/Workers/AbstractForeverLoopWorker.php @@ -2,13 +2,13 @@ namespace Benzine\Workers; -abstract class ForeverLoopWorker extends AbstractWorker implements WorkerInterface +abstract class AbstractForeverLoopWorker extends AbstractWorker implements WorkerInterface { public function run(): void { $this->logger->debug("Running with an interval of {$this->timeBetweenRuns} seconds."); while (true) { - $didWork = $this->iterate(); + $this->iterate(); sleep($this->timeBetweenRuns); } } diff --git a/src/Workers/WorkerWorkItem.php b/src/Workers/WorkerWorkItem.php index b2acb5c..5a9e369 100644 --- a/src/Workers/WorkerWorkItem.php +++ b/src/Workers/WorkerWorkItem.php @@ -2,6 +2,7 @@ namespace Benzine\Workers; +use Benzine\Exceptions\WorkerException; use Benzine\ORM\Abstracts\AbstractModel; class WorkerWorkItem @@ -20,7 +21,7 @@ class WorkerWorkItem case 'get': return $this->data[$field]; default: - throw new \Exception("Method {$name} doesn't exist"); + throw new WorkerException("Method {$name} doesn't exist"); } } diff --git a/tests/BaseTestCase.php b/tests/AbstractBaseTestCase.php similarity index 97% rename from tests/BaseTestCase.php rename to tests/AbstractBaseTestCase.php index 8d9fb0c..c372304 100644 --- a/tests/BaseTestCase.php +++ b/tests/AbstractBaseTestCase.php @@ -5,9 +5,8 @@ namespace Benzine\Tests; use Faker\Factory as FakerFactory; use Faker\Generator; use Faker\Provider; -use PHPUnit\Framework\TestCase; -abstract class BaseTestCase extends TestCase +abstract class AbstractBaseTestCase extends AbstractTestCase { // Set this to true if you want to see whats going on inside some unit tests.. public const DEBUG_MODE = false; diff --git a/tests/RoutesTestCase.php b/tests/AbstractRoutesTestCase.php similarity index 93% rename from tests/RoutesTestCase.php rename to tests/AbstractRoutesTestCase.php index a9a987b..7d75e44 100644 --- a/tests/RoutesTestCase.php +++ b/tests/AbstractRoutesTestCase.php @@ -6,7 +6,7 @@ use Benzine\Tests\Traits\AppTestTrait; use Psr\Http\Message\ResponseInterface; use Slim\Http\Request; -abstract class RoutesTestCase extends BaseTestCase +abstract class AbstractRoutesTestCase extends AbstractBaseTestCase { use AppTestTrait; diff --git a/tests/SeleniumTestCase.php b/tests/AbstractSeleniumTestCase.php similarity index 94% rename from tests/SeleniumTestCase.php rename to tests/AbstractSeleniumTestCase.php index 82727c8..e6311e5 100644 --- a/tests/SeleniumTestCase.php +++ b/tests/AbstractSeleniumTestCase.php @@ -5,7 +5,7 @@ namespace Benzine\Tests; use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\WebDriverCapabilityType; -abstract class SeleniumTestCase extends BaseTestCase +abstract class AbstractSeleniumTestCase extends AbstractBaseTestCase { /** @var RemoteWebDriver */ protected static $webDriver; diff --git a/tests/TestCase.php b/tests/AbstractTestCase.php similarity index 94% rename from tests/TestCase.php rename to tests/AbstractTestCase.php index 3479ae5..1c471d2 100644 --- a/tests/TestCase.php +++ b/tests/AbstractTestCase.php @@ -2,7 +2,9 @@ namespace Benzine\Tests; -abstract class TestCase extends \PHPUnit\Framework\TestCase +use PHPUnit\Framework\TestCase; + +abstract class AbstractTestCase extends TestCase { use Traits\OverrideProtectionTrait; use Traits\ArrayEquitabilityTrait;