From 33858d801d08fc624dfb89fff4ae6eb64dc020de Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 10 Jan 2021 12:45:40 +0700 Subject: [PATCH 001/212] Updated releases in README.md. --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7a688dabd..c19e8543b 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,14 @@ PHP Censor versions: -| Version | Latest | Branch | Status | Minimal PHP Version | -| :------------------: | :------: | :-----------: | :-------------------------------------: | :-----------------: | -| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.0` | `release-1.3` | Current stable version (**ONLY FIXES**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | WIP | `master` | Future stable major version (WIP) | `>=7.4` | +| Version | Latest | Branch | Status | Minimal PHP Version | +| :------------------: | :------: | :-----------: | :---------------------------------: | :-----------------: | +| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.3` (Jerry Smith) | `1.3.0` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.0` | `release-2.0` | Current stable version | `>=7.4` | +| `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 64243fe3ee1f29befdc0820b8c830dfe6b7abca3 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 21 Mar 2021 16:42:58 +0700 Subject: [PATCH 002/212] Fixed versions in README.md. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 419df8f58..961b7e3ce 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ PHP Censor versions: | `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.0` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.0` | `release-2.0` | Current stable version | `>=7.4` | +| `1.3` (Jerry Smith) | `1.3.2` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.2` | `release-2.0` | Current stable version | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From f5368a134d5b9e3a39ec137485b4b18b08e53069 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 2 Apr 2021 23:27:51 +0700 Subject: [PATCH 003/212] Small typo fix. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5230daa8a..76c5b0570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,7 +51,7 @@ binary (Symfony CLI) or `fabpot/local-php-security-checker` tool for working. Se [Full Changelog](https://github.com/php-censor/php-censor/compare/1.3.0...2.0.0) -### [How tp upgrade from v1 to v2](/docs/UPGRADE_2.0.md) +### [How to upgrade from v1 to v2](/docs/UPGRADE_2.0.md) ### Changed From 0b52167c21749fd1cbf270eb217dd6b7e97d1be3 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 3 Apr 2021 22:46:59 +0700 Subject: [PATCH 004/212] Added "environment" GET parameter for Git webhook. Issue #407. --- src/Controller/WebhookController.php | 127 ++++++++++++++++++++------- 1 file changed, 95 insertions(+), 32 deletions(-) diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index 3243bb115..c14baedb6 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -17,6 +17,7 @@ use PHPCensor\Model\Project; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; +use PHPCensor\Store\EnvironmentStore; use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; @@ -106,7 +107,8 @@ protected function createBuild( $tag, $committer, $commitMessage, - array $extra = null + array $extra = null, + $environment = null ) { if ($project->getArchived()) { throw new NotFoundException(Lang::get('project_x_not_found', $project->getId())); @@ -135,36 +137,38 @@ protected function createBuild( $environments = $project->getEnvironmentsObjects(); if ($environments['count']) { - $createdBuilds = []; - $environmentIds = $project->getEnvironmentsNamesByBranch($branch); - // use base branch from project - if (!empty($environmentIds)) { - $duplicates = []; - foreach ($environmentIds as $environmentId) { - if (!in_array($environmentId, $ignoreEnvironments) || - ($tag && !in_array($tag, $ignoreTags, true))) { - // If not, create a new build job for it: - $build = $this->buildService->createBuild( - $project, - $environmentId, - $commitId, - $project->getDefaultBranch(), - $tag, - $committer, - $commitMessage, - (int)$source, - null, - $extra - ); - - $createdBuilds[] = [ - 'id' => $build->getID(), - 'environment' => $environmentId, - ]; - } else { - $duplicates[] = \array_search($environmentId, $ignoreEnvironments); - } + $createdBuilds = []; + + /** @var EnvironmentStore $environmentStore */ + $environmentStore = Factory::getStore('Environment'); + $environmentObject = $environmentStore->getByNameAndProjectId($environment, $project->getId()); + if ($environment && $environmentObject) { + if ( + !in_array($environmentObject->getId(), $ignoreEnvironments) || + ($tag && !in_array($tag, $ignoreTags, true)) + ) { + // If not, create a new build job for it: + $build = $this->buildService->createBuild( + $project, + $environmentObject->getId(), + $commitId, + $project->getDefaultBranch(), + $tag, + $committer, + $commitMessage, + (int)$source, + null, + $extra + ); + + $createdBuilds[] = [ + 'id' => $build->getID(), + 'environment' => $environmentObject->getId(), + ]; + } else { + $duplicates[] = \array_search($environmentObject->getId(), $ignoreEnvironments); } + if (!empty($createdBuilds)) { if (empty($duplicates)) { return ['status' => 'ok', 'builds' => $createdBuilds]; @@ -188,7 +192,63 @@ protected function createBuild( ]; } } else { - return ['status' => 'ignored', 'message' => 'Branch not assigned to any environment']; + $environmentIds = $project->getEnvironmentsNamesByBranch($branch); + // use base branch from project + if (!empty($environmentIds)) { + $duplicates = []; + foreach ($environmentIds as $environmentId) { + if ( + !in_array($environmentId, $ignoreEnvironments) || + ($tag && !in_array($tag, $ignoreTags, true)) + ) { + // If not, create a new build job for it: + $build = $this->buildService->createBuild( + $project, + $environmentId, + $commitId, + $project->getDefaultBranch(), + $tag, + $committer, + $commitMessage, + (int)$source, + null, + $extra + ); + + $createdBuilds[] = [ + 'id' => $build->getID(), + 'environment' => $environmentId, + ]; + } else { + $duplicates[] = \array_search($environmentId, $ignoreEnvironments); + } + } + + if (!empty($createdBuilds)) { + if (empty($duplicates)) { + return ['status' => 'ok', 'builds' => $createdBuilds]; + } else { + return [ + 'status' => 'ok', + 'builds' => $createdBuilds, + 'message' => sprintf( + 'For this commit some builds already exists (%s)', + implode(', ', $duplicates) + ) + ]; + } + } else { + return [ + 'status' => 'ignored', + 'message' => sprintf( + 'For this commit already created builds (%s)', + implode(', ', $duplicates) + ) + ]; + } + } else { + return ['status' => 'ignored', 'message' => 'Branch not assigned to any environment']; + } } } else { $environmentId = null; @@ -272,6 +332,7 @@ public function git($projectId) Project::TYPE_GIT, ]); $branch = $this->getParam('branch', $project->getDefaultBranch()); + $environment = $this->getParam('environment'); $commit = $this->getParam('commit'); $commitMessage = $this->getParam('message'); $committer = $this->getParam('committer'); @@ -283,7 +344,9 @@ public function git($projectId) $branch, null, $committer, - $commitMessage + $commitMessage, + null, + $environment ); } From bbd235ae6d239e2c2fdcf48d5138b20124d86e0e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 19 May 2021 22:12:13 +0700 Subject: [PATCH 005/212] Refactoring: Improved application configuration. --- bin/console | 4 +- bootstrap.php | 52 ++--- composer.json | 2 + composer.lock | 73 +++++- public/index.php | 7 +- src/Application.php | 34 ++- src/BuildFactory.php | 18 +- src/Builder.php | 94 ++------ src/Command/Action/CreateAdmin.php | 105 +++++++++ src/Command/CheckLocalizationCommand.php | 99 +++------ src/Command/Command.php | 81 +++++++ src/Command/CreateAdminCommand.php | 87 +++----- src/Command/CreateBuildCommand.php | 43 ++-- src/Command/InstallCommand.php | 185 ++++++--------- src/Command/LoggingCommand.php | 74 ------ src/Command/RebuildQueueCommand.php | 51 +---- src/Command/RemoveOldBuildsCommand.php | 51 +++-- src/Command/WorkerCommand.php | 36 ++- src/Config.php | 210 ------------------ src/Configuration.php | 37 +++ src/ConfigurationInterface.php | 11 + src/Console/Application.php | 51 +++-- src/Controller.php | 12 +- src/Controller/BuildController.php | 20 +- src/Controller/BuildStatusController.php | 2 +- src/Controller/HomeController.php | 3 +- src/Controller/ProjectController.php | 8 +- src/Controller/SessionController.php | 5 +- src/Controller/UserController.php | 5 +- src/Controller/WebhookController.php | 11 +- src/Controller/WidgetLastBuildsController.php | 4 +- src/Database.php | 10 +- src/DatabaseConnection.php | 107 +++++++++ src/DatabaseManager.php | 103 +++++++++ src/Form/DataTransformer/Yaml.php | 4 +- src/Helper/AnsiConverter.php | 46 ---- src/Helper/Bitbucket.php | 21 +- src/Helper/Email.php | 6 +- src/Helper/Github.php | 13 +- src/Helper/Lang.php | 8 +- src/Helper/SshKey.php | 13 +- src/Http/Router.php | 13 +- src/Logging/AnsiFormatter.php | 4 +- src/Logging/BuildLogger.php | 86 ++----- src/Logging/OutputLogHandler.php | 9 +- src/Model/Build/BitbucketBuild.php | 19 +- src/Model/Build/GitBuild.php | 12 + src/Model/Build/GithubBuild.php | 14 +- src/Model/User.php | 9 +- src/Plugin/EmailNotify.php | 4 +- src/Plugin/Option/PhpUnitOptions.php | 34 ++- src/Plugin/Pdepend.php | 4 +- src/Plugin/PhpUnit.php | 6 +- src/ProcessControl/Factory.php | 54 ----- src/ProcessControl/PosixProcessControl.php | 42 ---- .../ProcessControlInterface.php | 30 --- src/ProcessControl/UnixProcessControl.php | 50 ----- src/Security/Authentication/Service.php | 40 +--- src/Service/BuildService.php | 43 ++-- src/Store/BuildErrorWriter.php | 27 ++- src/View.php | 11 - src/View/Email/long.phtml | 7 +- src/View/layout.phtml | 4 +- src/WebController.php | 7 +- src/Worker/BuildWorker.php | 67 ++---- tests/bootstrap.php | 34 +-- tests/data/configuration.yml | 2 + tests/src/Command/CreateAdminCommandTest.php | 12 +- tests/src/Command/CreateBuildCommandTest.php | 12 +- tests/src/ConfigurationTest.php | 25 +++ tests/src/DatabaseMysqlTest.php | 0 tests/src/DatabasePostgresqlTest.php | 0 tests/src/Helper/AnsiConverterTest.php | 6 +- tests/src/Helper/EmailTest.php | 4 +- tests/src/Logging/AnsiFormatterTest.php | 31 +++ tests/src/Logging/BuildLogger2Test.php | 22 ++ tests/src/Logging/OutputLogHandlerTest.php | 35 +++ tests/src/Model/BuildTest.php | 3 + tests/src/Plugin/EmailTest.php | 4 +- .../src/Plugin/Option/PhpUnitOptionsTest.php | 8 +- tests/src/Plugin/PhpUnitTest.php | 20 +- .../PosixProcessControlTest.php | 18 -- .../src/ProcessControl/ProcessControlTest.php | 130 ----------- .../ProcessControl/UnixProcessControlTest.php | 23 -- .../Security/Authentication/ServiceTest.php | 13 +- tests/src/Service/BuildServiceTest.php | 24 +- tests/src/StoreMysqlTest.php | 0 tests/src/StorePostgresqlTest.php | 0 88 files changed, 1238 insertions(+), 1590 deletions(-) create mode 100644 src/Command/Action/CreateAdmin.php create mode 100644 src/Command/Command.php delete mode 100644 src/Command/LoggingCommand.php delete mode 100644 src/Config.php create mode 100644 src/Configuration.php create mode 100644 src/ConfigurationInterface.php create mode 100644 src/DatabaseConnection.php create mode 100644 src/DatabaseManager.php delete mode 100644 src/Helper/AnsiConverter.php delete mode 100644 src/ProcessControl/Factory.php delete mode 100644 src/ProcessControl/PosixProcessControl.php delete mode 100644 src/ProcessControl/ProcessControlInterface.php delete mode 100644 src/ProcessControl/UnixProcessControl.php create mode 100644 tests/data/configuration.yml create mode 100644 tests/src/ConfigurationTest.php delete mode 100644 tests/src/DatabaseMysqlTest.php delete mode 100644 tests/src/DatabasePostgresqlTest.php create mode 100644 tests/src/Logging/AnsiFormatterTest.php create mode 100644 tests/src/Logging/BuildLogger2Test.php create mode 100644 tests/src/Logging/OutputLogHandlerTest.php delete mode 100644 tests/src/ProcessControl/PosixProcessControlTest.php delete mode 100644 tests/src/ProcessControl/ProcessControlTest.php delete mode 100644 tests/src/ProcessControl/UnixProcessControlTest.php delete mode 100644 tests/src/StoreMysqlTest.php delete mode 100644 tests/src/StorePostgresqlTest.php diff --git a/bin/console b/bin/console index 591f7fd43..32cf66b17 100755 --- a/bin/console +++ b/bin/console @@ -1,11 +1,13 @@ #!/usr/bin/env php run(); +(new Application($configuration))->run(); diff --git a/bootstrap.php b/bootstrap.php index c9bd92bb8..7480aa55a 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -1,48 +1,22 @@ loadYaml($configFile); -} +Database::$configuration = $configuration; -if (!defined('APP_URL') && !empty($config)) { - define('APP_URL', $config->get('php-censor.url', '') . '/'); -} +\define('APP_URL', $configuration->get('php-censor.url', '') . '/'); -Lang::init($config); +Lang::init($configuration); diff --git a/composer.json b/composer.json index 32dfdf526..f299e4ccd 100644 --- a/composer.json +++ b/composer.json @@ -55,6 +55,8 @@ "ext-curl": "*", "ext-bcmath": "*", + "php-censor/common": "dev-master", + "swiftmailer/swiftmailer": "^6.2", "symfony/yaml": "^4.4", "symfony/console": "^4.4", diff --git a/composer.lock b/composer.lock index 8c7f96c0d..5c279927c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3ee10151a1e6af40476ea0e3035893be", + "content-hash": "dd218b940a7209cfbb51dbfe3a08f7c2", "packages": [ { "name": "cakephp/core", @@ -883,6 +883,73 @@ }, "time": "2020-09-22T07:17:48+00:00" }, + { + "name": "php-censor/common", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-censor/common.git", + "reference": "6b36aa2e5e95a18aab130611e209f81f48a3ae28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-censor/common/zipball/6b36aa2e5e95a18aab130611e209f81f48a3ae28", + "reference": "6b36aa2e5e95a18aab130611e209f81f48a3ae28", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.4.0", + "psr/container": "^1.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.16", + "infection/infection": "^0.12", + "phpunit/phpunit": "^7.5", + "vimeo/psalm": "^3.16" + }, + "default-branch": true, + "type": "library", + "extra": { + "platform": { + "php": "7.4.*" + } + }, + "autoload": { + "psr-4": { + "PHPCensor\\Common\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Dmitry Khomutov", + "email": "poisoncorpsee@gmail.com", + "homepage": "http://corpsee.com", + "role": "PHP Censor developer" + } + ], + "description": "PHP Censor Common Library", + "homepage": "https://php-censor.info", + "keywords": [ + "ci", + "ci-server", + "continuous integration", + "open-source", + "php", + "php-censor", + "self-hosted", + "testing" + ], + "support": { + "issues": "https://github.com/php-censor/common/issues", + "source": "https://github.com/php-censor/common" + }, + "time": "2021-04-25T06:46:27+00:00" + }, { "name": "php-censor/flowdock-client", "version": "1.0.0", @@ -6926,7 +6993,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "php-censor/common": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/public/index.php b/public/index.php index 753adf5e2..e7a5d4410 100644 --- a/public/index.php +++ b/public/index.php @@ -1,8 +1,11 @@ handleRequest(); diff --git a/src/Application.php b/src/Application.php index 5e9be7850..4ce3edbbb 100644 --- a/src/Application.php +++ b/src/Application.php @@ -17,46 +17,45 @@ class Application { /** - * @var array + * @var array|null */ - protected $route; + protected ?array $route; /** * @var Controller|WebController */ - protected $controller; + protected Controller $controller; /** * @var Request */ - protected $request; + protected Request $request; /** - * @var Config + * @var ConfigurationInterface */ - protected $config; + protected ConfigurationInterface $config; /** * @var Router */ - protected $router; + protected Router $router; /** - * @param Config $config + * @param ConfigurationInterface $config * * @param Request|null $request */ - public function __construct(Config $config, Request $request = null) + public function __construct(ConfigurationInterface $config, Request $request = null) { $this->config = $config; + $this->request = new Request(); if (!is_null($request)) { $this->request = $request; - } else { - $this->request = new Request(); } - $this->router = new Router($this, $this->request, $this->config); + $this->router = new Router($this, $this->request); $this->init(); } @@ -149,8 +148,6 @@ public function handleRequest() try { $response = $this->handleRequestInner(); } catch (HttpException $ex) { - $this->config->set('page_title', 'Error'); - $view = new View('exception'); $view->exception = $ex; @@ -159,8 +156,6 @@ public function handleRequest() $response->setResponseCode($ex->getErrorCode()); $response->setContent($view->render()); } catch (Exception $ex) { - $this->config->set('page_title', 'Error'); - $view = new View('exception'); $view->exception = $ex; @@ -195,11 +190,10 @@ protected function loadController($class) * * @return bool */ - protected function shouldSkipAuth() + protected function shouldSkipAuth(): bool { - $config = Config::getInstance(); - $disableAuth = (bool)$config->get('php-censor.security.disable_auth', false); - $defaultUserId = (int)$config->get('php-censor.security.default_user_id', 1); + $disableAuth = (bool)$this->config->get('php-censor.security.disable_auth', false); + $defaultUserId = (int)$this->config->get('php-censor.security.default_user_id', 1); if ($disableAuth && $defaultUserId) { $user = Factory::getStore('User')->getByPrimaryKey($defaultUserId); diff --git a/src/BuildFactory.php b/src/BuildFactory.php index cce0531ae..67051e2a9 100644 --- a/src/BuildFactory.php +++ b/src/BuildFactory.php @@ -14,13 +14,14 @@ class BuildFactory { /** - * @param int $buildId + * @param ConfigurationInterface $configuration + * @param int $buildId * * @return Build|null * * @throws Exception\HttpException */ - public static function getBuildById($buildId) + public static function getBuildById(ConfigurationInterface $configuration, int $buildId): ?Build { $build = Factory::getStore('Build')->getById($buildId); @@ -28,20 +29,23 @@ public static function getBuildById($buildId) return null; } - return self::getBuild($build); + return self::getBuild($configuration, $build); } /** * Takes a generic build and returns a type-specific build model. * - * @param Build $build The build from which to get a more specific build type. + * @param ConfigurationInterface $configuration + * @param Build $build * * @return Build * * @throws Exception\HttpException */ - public static function getBuild(Build $build) - { + public static function getBuild( + ConfigurationInterface $configuration, + Build $build + ): Build { $project = $build->getProject(); if (!empty($project)) { @@ -81,7 +85,7 @@ public static function getBuild(Build $build) } $class = '\\PHPCensor\\Model\\Build\\' . $type; - $build = new $class($build->getDataArray()); + $build = new $class($configuration, $build->getDataArray()); } return $build; diff --git a/src/Builder.php b/src/Builder.php index 1a66a885c..c4a139ef2 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -13,14 +13,13 @@ use PHPCensor\Store\BuildErrorWriter; use PHPCensor\Store\BuildStore; use PHPCensor\Store\Factory; -use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; /** * @author Dan Cryer */ -class Builder implements LoggerAwareInterface +class Builder { /** * @var string @@ -107,16 +106,20 @@ class Builder implements LoggerAwareInterface */ private $buildErrorWriter; + private ConfigurationInterface $configuration; + /** * Set up the builder. * - * @param Build $build + * @param ConfigurationInterface $configuration + * @param Build $build * @param LoggerInterface $logger */ - public function __construct(Build $build, LoggerInterface $logger = null) + public function __construct(ConfigurationInterface $configuration, Build $build, LoggerInterface $logger = null) { - $this->build = $build; - $this->store = Factory::getStore('Build'); + $this->configuration = $configuration; + $this->build = $build; + $this->store = Factory::getStore('Build'); $this->buildLogger = new BuildLogger($logger, $build); $pluginFactory = $this->buildPluginFactory($build); @@ -130,21 +133,20 @@ public function __construct(Build $build, LoggerInterface $logger = null) ); $this->interpolator = new BuildInterpolator(); - $this->buildErrorWriter = new BuildErrorWriter($this->build->getProjectId(), $this->build->getId()); + $this->buildErrorWriter = new BuildErrorWriter($this->configuration, $this->build->getProjectId(), $this->build->getId()); } - /** - * @return BuildLogger - */ - public function getBuildLogger() + public function getBuildLogger(): BuildLogger { return $this->buildLogger; } - /** - * @return null|string - */ - public function getCurrentStage() + public function getConfiguration(): ConfigurationInterface + { + return $this->configuration; + } + + public function getCurrentStage(): ?string { return $this->currentStage; } @@ -189,17 +191,7 @@ public function getConfig($key = null) */ public function getSystemConfig($key) { - return Config::getInstance()->get($key); - } - - /** - * @return string The title of the project being built. - * - * @throws Exception\HttpException - */ - public function getBuildProjectTitle() - { - return $this->build->getProject()->getTitle(); + return $this->configuration->get($key); } /** @@ -292,7 +284,7 @@ public function execute() $this->build->sendStatusPostback(); $this->build->setFinishDate(new DateTime()); - $removeBuilds = (bool)Config::getInstance()->get('php-censor.build.remove_builds', true); + $removeBuilds = (bool)$this->configuration->get('php-censor.build.remove_builds', true); if ($removeBuilds) { // Clean up: $this->buildLogger->log(''); @@ -474,65 +466,27 @@ protected function setupBuild() return true; } - /** - * Sets a logger instance on the object - * - * @param LoggerInterface $logger - */ - public function setLogger(LoggerInterface $logger) - { - $this->buildLogger->setLogger($logger); - } - - /** - * Write to the build log. - * - * @param string $message - * @param string $level - * @param array $context - */ - public function log($message, $level = LogLevel::INFO, $context = []) + public function log(string $message, string $level = LogLevel::INFO, array $context = []): void { $this->buildLogger->log($message, $level, $context); } - /** - * Add a warning-coloured message to the log. - * - * @param string $message - */ - public function logWarning($message) + public function logWarning(string $message): void { $this->buildLogger->logWarning($message); } - /** - * Add a success-coloured message to the log. - * - * @param string $message - */ - public function logSuccess($message) + public function logSuccess(string $message): void { $this->buildLogger->logSuccess($message); } - /** - * Add a failure-coloured message to the log. - * - * @param string $message - * @param Exception $exception The exception that caused the error. - */ - public function logFailure($message, Exception $exception = null) + public function logFailure(string $message, ?\Throwable $exception = null): void { $this->buildLogger->logFailure($message, $exception); } - /** - * Add a debug-coloured message to the log. - * - * @param string $message - */ - public function logDebug($message) + public function logDebug(string $message): void { $this->buildLogger->logDebug($message); } diff --git a/src/Command/Action/CreateAdmin.php b/src/Command/Action/CreateAdmin.php new file mode 100644 index 000000000..17a6e5dc5 --- /dev/null +++ b/src/Command/Action/CreateAdmin.php @@ -0,0 +1,105 @@ + + */ +class CreateAdmin +{ + private QuestionHelper $questionHelper; + + private InputInterface $input; + + private OutputInterface $output; + + private UserStore $userStore; + + public function __construct( + QuestionHelper $questionHelper, + InputInterface $input, + OutputInterface $output, + UserStore $userStore + ) { + $this->questionHelper = $questionHelper; + $this->input = $input; + $this->output = $output; + $this->userStore = $userStore; + } + + public function process(): array + { + $result = []; + $mailValidator = function ($answer) { + if (!\filter_var($answer, FILTER_VALIDATE_EMAIL)) { + throw new InvalidArgumentException('Must be a valid email address.'); + } + + return $answer; + }; + + if ($adminEmail = $this->input->getOption('admin-email')) { + $adminEmail = $mailValidator($adminEmail); + } else { + $questionEmail = new Question('Admin email: '); + $adminEmail = $this->questionHelper->ask($this->input, $this->output, $questionEmail); + } + + if (!$adminName = $this->input->getOption('admin-name')) { + $questionName = new Question('Admin name: '); + $adminName = $this->questionHelper->ask($this->input, $this->output, $questionName); + } + + if (!$adminPassword = $this->input->getOption('admin-password')) { + $questionPassword = new Question('Admin password: '); + $questionPassword->setHidden(true); + $questionPassword->setHiddenFallback(false); + $adminPassword = $this->questionHelper->ask($this->input, $this->output, $questionPassword); + } + + $result['email'] = $adminEmail; + $result['name'] = $adminName; + $result['password'] = $adminPassword; + + return $result; + } + + public function create(array $adminDetails): void + { + try { + $adminUser = $this->userStore->getByEmail($adminDetails['email']); + if ($adminUser) { + throw new \RuntimeException('Admin account already exists!'); + } + + $userService = new UserService($this->userStore); + + $userService->createUser( + $adminDetails['name'], + $adminDetails['email'], + 'internal', + ['type' => 'internal'], + $adminDetails['password'], + true + ); + + $this->output->writeln('User account created!'); + } catch (\Throwable $ex) { + $this->output->writeln('PHP Censor failed to create your admin account!'); + $this->output->writeln('' . $ex->getMessage() . ''); + } + } +} diff --git a/src/Command/CheckLocalizationCommand.php b/src/Command/CheckLocalizationCommand.php index a8ae6ea75..0a5e066a3 100644 --- a/src/Command/CheckLocalizationCommand.php +++ b/src/Command/CheckLocalizationCommand.php @@ -1,65 +1,36 @@ */ class CheckLocalizationCommand extends Command { - /** - * @var string - */ - protected $basePath; - - /** - * @var array - */ - protected $excluded = ['lang.en.php']; - - /** - * Construct. - */ - public function __construct() - { - parent::__construct(); + protected string $basePath = __DIR__ . '/../Languages'; - $this->basePath = __DIR__.'/../Languages'; - } + protected array $excluded = ['lang.en.php']; - /** - * Configure. - */ protected function configure() { $this ->setName('php-censor:check-localizations') - ->addOption( - 'same', - 0, - InputOption::VALUE_OPTIONAL, - 'Same than English version (0 = no, 1 = yes)' - ) - ->addOption( - 'langs', - [], - InputOption::VALUE_OPTIONAL, - 'List of languages separated by commas. By default, all languages' - ) + + ->addOption('same', 0, InputOption::VALUE_OPTIONAL, 'Same than English version (0 = no, 1 = yes)') + ->addOption('langs', [], InputOption::VALUE_OPTIONAL, 'List of languages separated by commas. By default, all languages') + ->setDescription('Check localizations.'); } - /** - * Loops through running. - * - * @param InputInterface $input - * @param OutputInterface $output - */ protected function execute(InputInterface $input, OutputInterface $output) { $output->writeln("\nCheck localizations!"); @@ -69,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : false; $languagesList = (null !== $input->getOption('langs')) - ? explode(',', $input->getOption('langs')) + ? \explode(',', $input->getOption('langs')) : []; // Get English version @@ -78,54 +49,40 @@ protected function execute(InputInterface $input, OutputInterface $output) $diffs = $this->compareTranslations($english, $othersLanguages); foreach ($diffs as $language => $value) { - $output->writeln(sprintf("%s:", $language)); + $output->writeln(\sprintf("%s:", $language)); if (!empty($value['not_present'])) { - $output->writeln("\tNot present:\n\t\t" . implode("\n\t\t", $value['not_present'])); + $output->writeln("\tNot present:\n\t\t" . \implode("\n\t\t", $value['not_present'])); } if ($sameThanEnglish === '1' && !empty($value['same'])) { - $output->writeln("\tSame than English:\n\t\t" . implode("\n\t\t", $value['same'])); + $output->writeln("\tSame than English:\n\t\t" . \implode("\n\t\t", $value['same'])); } } } - /** - * Returns array of translations by language. - * - * @param string $language language code - * - * @return array - */ - private function getTranslations($language) + private function getTranslations(string $language): array { return [ - include($language) + include $language, ]; } - /** - * Returns list of languages. - * - * @param array $languagesList - * - * @return array - */ - private function getLanguages(array $languagesList = []) + private function getLanguages(array $languagesList = []): array { - $files = glob($this->basePath . '/*.php'); + $files = \glob($this->basePath . '/*.php'); - $languages = array_map(function ($dir) use ($languagesList) { - $name = basename($dir); + $languages = \array_map(function ($dir) use ($languagesList) { + $name = \basename($dir); - if (in_array($name, $this->excluded, true)) { + if (\in_array($name, $this->excluded, true)) { return null; } // Check if in list of languages. if (!empty($languagesList)) { - $languageOfName = explode('.', $name); + $languageOfName = \explode('.', $name); - if (null == $languageOfName[1] || !in_array($languageOfName[1], $languagesList)) { + if (null == $languageOfName[1] || !\in_array($languageOfName[1], $languagesList)) { return null; } } @@ -133,7 +90,7 @@ private function getLanguages(array $languagesList = []) return $name; }, $files); - return array_filter($languages); + return \array_filter($languages); } /** @@ -144,7 +101,7 @@ private function getLanguages(array $languagesList = []) * * @return array */ - private function compareTranslations(array $default, array $languages) + private function compareTranslations(array $default, array $languages): array { $diffs = []; @@ -153,7 +110,7 @@ private function compareTranslations(array $default, array $languages) $current = $this->getTranslations($this->basePath.'/'.$language); foreach ($default as $key => $values) { - $keyValues = array_keys($values); + $keyValues = \array_keys($values); foreach ($keyValues as $key2) { if (!isset($current[$key][$key2])) { diff --git a/src/Command/Command.php b/src/Command/Command.php new file mode 100644 index 000000000..78e44ff5b --- /dev/null +++ b/src/Command/Command.php @@ -0,0 +1,81 @@ + + */ +abstract class Command extends BaseCommand +{ + protected ConfigurationInterface $configuration; + + protected LoggerInterface $logger; + + public function __construct( + ConfigurationInterface $configuration, + LoggerInterface $logger, + ?string $name = null + ) { + parent::__construct($name); + + $this->configuration = $configuration; + $this->logger = $logger; + } + + protected function configureLogging(OutputInterface $output) + { + $level = LogLevel::ERROR; + if ($output->isDebug()) { + $level = LogLevel::DEBUG; + } elseif ($output->isVeryVerbose()) { + $level = LogLevel::INFO; + } elseif ($output->isVerbose()) { + $level = LogLevel::NOTICE; + } + + if ($this->logger instanceof Logger) { + $handlers = $this->logger->getHandlers(); + foreach ($handlers as $handler) { + if ($handler instanceof AbstractHandler) { + $handler->setLevel($level); + } + } + + if (!$output->isQuiet()) { + $this->logger->pushHandler( + new OutputLogHandler($output, $level) + ); + } + } + + if ($output->isDebug()) { + $this->logger->notice( + \sprintf('Command "%s" started in debug mode (-vvv).', $this->getName()) + ); + + \define('DEBUG_MODE', true); + } + } + + protected function execute( + InputInterface $input, + OutputInterface $output + ) { + $this->configureLogging($output); + } +} diff --git a/src/Command/CreateAdminCommand.php b/src/Command/CreateAdminCommand.php index c9f660af0..132605bea 100644 --- a/src/Command/CreateAdminCommand.php +++ b/src/Command/CreateAdminCommand.php @@ -1,12 +1,15 @@ * @author Wogan May (@woganmay) */ class CreateAdminCommand extends Command { - /** - * @var UserStore - */ - protected $userStore; + protected UserStore $userStore; - /** - * @param UserStore $userStore - */ - public function __construct(UserStore $userStore) - { - parent::__construct(); + public function __construct( + ConfigurationInterface $configuration, + LoggerInterface $logger, + UserStore $userStore, + ?string $name = null + ) { + parent::__construct($configuration, $logger, $name); $this->userStore = $userStore; } @@ -47,52 +50,20 @@ protected function configure() ->setDescription('Create an admin user'); } - /** - * Creates an admin user in the existing database - * - * {@inheritDoc} - */ protected function execute(InputInterface $input, OutputInterface $output) { - /** @var $helper QuestionHelper */ - $helper = $this->getHelperSet()->get('question'); - - // Function to validate email address. - $mailValidator = function ($answer) { - if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) { - throw new InvalidArgumentException('Must be a valid email address.'); - } - - return $answer; - }; - - if ($adminEmail = $input->getOption('admin-email')) { - $adminEmail = $mailValidator($adminEmail); - } else { - $questionEmail = new Question('Admin email: '); - $adminEmail = $helper->ask($input, $output, $questionEmail); - } - - if (!$adminName = $input->getOption('admin-name')) { - $questionName = new Question('Admin name: '); - $adminName = $helper->ask($input, $output, $questionName); - } - - if (!$adminPassword = $input->getOption('admin-password')) { - $questionPassword = new Question('Admin password: '); - $questionPassword->setHidden(true); - $questionPassword->setHiddenFallback(false); - $adminPassword = $helper->ask($input, $output, $questionPassword); - } - - try { - $userService = new UserService($this->userStore); - $userService->createUser($adminName, $adminEmail, 'internal', ['type' => 'internal'], $adminPassword, true); - - $output->writeln('User account created!'); - } catch (Exception $ex) { - $output->writeln('PHP Censor failed to create your admin account!'); - $output->writeln('' . $ex->getMessage() . ''); - } + /** @var $questionHelper QuestionHelper */ + $questionHelper = $this->getHelperSet()->get('question'); + + $createAdmin = new CreateAdmin( + $questionHelper, + $input, + $output, + $this->userStore + ); + + $createAdmin->create( + $createAdmin->process() + ); } } diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index 531547f00..c39266ccc 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -1,52 +1,48 @@ * @author Jérémy DECOOL (@jdecool) */ class CreateBuildCommand extends Command { - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; - /** - * @param ProjectStore $projectStore - * @param BuildService $buildService - */ - public function __construct(ProjectStore $projectStore, BuildService $buildService) - { - parent::__construct(); + public function __construct( + ConfigurationInterface $configuration, + LoggerInterface $logger, + ProjectStore $projectStore, + BuildService $buildService, + ?string $name = null + ) { + parent::__construct($configuration, $logger, $name); $this->projectStore = $projectStore; $this->buildService = $buildService; } - /** - * {@inheritDoc} - */ protected function configure() { $this @@ -61,9 +57,6 @@ protected function configure() ->setDescription('Create a build for a project'); } - /** - * {@inheritDoc} - */ public function execute(InputInterface $input, OutputInterface $output) { $projectId = $input->getArgument('projectId'); @@ -101,7 +94,7 @@ public function execute(InputInterface $input, OutputInterface $output) ); $output->writeln('Build Created'); - } catch (Exception $e) { + } catch (\Throwable $e) { $output->writeln('Failed'); $output->writeln(sprintf('%s', $e->getMessage())); } diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index dfb9c1975..c9a80f324 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -1,39 +1,38 @@ * @author Dan Cryer */ class InstallCommand extends Command { - /** - * @var string - */ - protected $configPath = APP_DIR . 'config.yml'; + protected string $configPath = APP_DIR . 'config.yml'; protected function configure() { @@ -100,9 +99,6 @@ protected function configure() ->setDescription('Install PHP Censor'); } - /** - * Installs PHP Censor - */ protected function execute(InputInterface $input, OutputInterface $output) { $configFromFile = (bool)$input->getOption('config-from-file'); @@ -145,26 +141,22 @@ protected function execute(InputInterface $input, OutputInterface $output) } $admin = $this->getAdminInformation($input, $output); - $this->createAdminUser($admin, $output); + $this->createAdminUser($admin, $input, $output); $this->createDefaultGroup($output); } - /** - * @param OutputInterface $output - * - * @return bool - */ - protected function verifyNotInstalled(OutputInterface $output) + private function verifyNotInstalled(OutputInterface $output): bool { - if (file_exists($this->configPath)) { - $content = file_get_contents($this->configPath); + if (\file_exists($this->configPath)) { + $content = \file_get_contents($this->configPath); if (!empty($content)) { $output->writeln( 'The PHP Censor config file exists and is not empty. ' . 'PHP Censor is already installed!' ); + return false; } } @@ -179,12 +171,12 @@ protected function verifyNotInstalled(OutputInterface $output) * * @throws Exception */ - protected function checkRequirements(OutputInterface $output) + private function checkRequirements(OutputInterface $output) { $output->writeln('Checking requirements...'); $errors = false; - if (!(version_compare(PHP_VERSION, '7.4.0') >= 0)) { + if (!(\version_compare(PHP_VERSION, '7.4.0') >= 0)) { $output->writeln(''); $output->writeln( 'PHP Censor requires at least PHP 7.4.0! Installed PHP ' . PHP_VERSION . ''); @@ -194,7 +186,7 @@ protected function checkRequirements(OutputInterface $output) $requiredExtensions = ['PDO', 'xml', 'json', 'curl', 'openssl']; foreach ($requiredExtensions as $extension) { - if (!extension_loaded($extension)) { + if (!\extension_loaded($extension)) { $output->writeln(''); $output->writeln('Extension required: ' . $extension . ''); $errors = true; @@ -204,7 +196,7 @@ protected function checkRequirements(OutputInterface $output) $requiredFunctions = ['exec', 'shell_exec', 'proc_open']; foreach ($requiredFunctions as $function) { - if (!function_exists($function)) { + if (!\function_exists($function)) { $output->writeln(''); $output->writeln( 'PHP Censor needs to be able to call the ' . $function . @@ -230,48 +222,27 @@ protected function checkRequirements(OutputInterface $output) * * @param InputInterface $input * @param OutputInterface $output + * * @return array + * + * @throws InvalidArgumentException */ - protected function getAdminInformation(InputInterface $input, OutputInterface $output) + private function getAdminInformation(InputInterface $input, OutputInterface $output): array { - $admin = []; - - /** @var $helper QuestionHelper */ - $helper = $this->getHelperSet()->get('question'); + /** @var $questionHelper QuestionHelper */ + $questionHelper = $this->getHelperSet()->get('question'); - // Function to validate email address. - $mailValidator = function ($answer) { - if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) { - throw new InvalidArgumentException('Must be a valid email address.'); - } + /** @var UserStore $userStore */ + $userStore = Factory::getStore('User'); - return $answer; - }; - - if ($adminEmail = $input->getOption('admin-email')) { - $adminEmail = $mailValidator($adminEmail); - } else { - $questionEmail = new Question('Admin email: '); - $adminEmail = $helper->ask($input, $output, $questionEmail); - } - - if (!$adminName = $input->getOption('admin-name')) { - $questionName = new Question('Admin name: '); - $adminName = $helper->ask($input, $output, $questionName); - } - - if (!$adminPassword = $input->getOption('admin-password')) { - $questionPassword = new Question('Admin password: '); - $questionPassword->setHidden(true); - $questionPassword->setHiddenFallback(false); - $adminPassword = $helper->ask($input, $output, $questionPassword); - } - - $admin['email'] = $adminEmail; - $admin['name'] = $adminName; - $admin['password'] = $adminPassword; + $createAdmin = new CreateAdmin( + $questionHelper, + $input, + $output, + $userStore + ); - return $admin; + return $createAdmin->process(); } /** @@ -281,18 +252,20 @@ protected function getAdminInformation(InputInterface $input, OutputInterface $o * @param OutputInterface $output * * @return array + * + * @throws Exception */ - protected function getConfigInformation(InputInterface $input, OutputInterface $output) + private function getConfigInformation(InputInterface $input, OutputInterface $output): array { /** @var $helper QuestionHelper */ $helper = $this->getHelperSet()->get('question'); $urlValidator = function ($answer) { - if (!filter_var($answer, FILTER_VALIDATE_URL)) { + if (!\filter_var($answer, FILTER_VALIDATE_URL)) { throw new Exception('Must be a valid URL.'); } - return rtrim($answer, '/'); + return \rtrim($answer, '/'); }; if ($url = $input->getOption('url')) { @@ -384,7 +357,7 @@ protected function getConfigInformation(InputInterface $input, OutputInterface $ * * @return array */ - protected function getQueueInformation(InputInterface $input, OutputInterface $output) + private function getQueueInformation(InputInterface $input, OutputInterface $output): array { $queueConfig = [ 'host' => null, @@ -433,7 +406,7 @@ protected function getQueueInformation(InputInterface $input, OutputInterface $o * * @return array */ - protected function getDatabaseInformation(InputInterface $input, OutputInterface $output) + private function getDatabaseInformation(InputInterface $input, OutputInterface $output): array { $db = []; @@ -442,7 +415,7 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface if (!$dbType = $input->getOption('db-type')) { $questionType = new Question('Enter your database type ("mysql" or "pgsql"): '); - $dbType = trim(strtolower($helper->ask($input, $output, $questionType))); + $dbType = \trim(\strtolower($helper->ask($input, $output, $questionType))); } if (!$dbHost = $input->getOption('db-host')) { @@ -450,7 +423,7 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface 'Enter your database host (default: "localhost"): ', 'localhost' ); - $dbHost = trim($helper->ask($input, $output, $questionHost)); + $dbHost = \trim($helper->ask($input, $output, $questionHost)); } $defaultPort = 3306; @@ -474,10 +447,10 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface if ( $dbType === 'pgsql' - && !$dbPgsqlSslmode = $input->getOption('db-pgsql-sslmode') + && !$dbPgsqlSslMode = $input->getOption('db-pgsql-sslmode') ) { - $questionSslmode = new Question('Enter your database connection\'s SSL mode (default: prefer): ', 'prefer'); - $dbPgsqlSslmode = $helper->ask($input, $output, $questionSslmode); + $questionSslMode = new Question('Enter your database connection\'s SSL mode (default: prefer): ', 'prefer'); + $dbPgsqlSslMode = $helper->ask($input, $output, $questionSslMode); } if (!$dbName = $input->getOption('db-name')) { @@ -485,7 +458,7 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface 'Enter your database name (default: "php-censor-db"): ', 'php-censor-db' ); - $dbName = trim($helper->ask($input, $output, $questionDb)); + $dbName = \trim($helper->ask($input, $output, $questionDb)); } if (!$dbUser = $input->getOption('db-user')) { @@ -493,7 +466,7 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface 'Enter your database user (default: "php-censor-user"): ', 'php-censor-user' ); - $dbUser = trim($helper->ask($input, $output, $questionUser)); + $dbUser = \trim($helper->ask($input, $output, $questionUser)); } if (!$dbPass = $input->getOption('db-password')) { @@ -509,8 +482,8 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface ] ]; - if ($dbType === 'pgsql' && !empty($dbPgsqlSslmode)) { - $dbServers[0]['pgsql-sslmode'] = $dbPgsqlSslmode; + if ($dbType === 'pgsql' && !empty($dbPgsqlSslMode)) { + $dbServers[0]['pgsql-sslmode'] = $dbPgsqlSslMode; } $dbServers[0]['port'] = $dbPort; @@ -534,7 +507,7 @@ protected function getDatabaseInformation(InputInterface $input, OutputInterface * * @return bool */ - protected function verifyDatabaseDetails(array $db, OutputInterface $output) + private function verifyDatabaseDetails(array $db, OutputInterface $output): bool { $dns = $db['type'] . ':host=' . $db['servers']['write'][0]['host']; @@ -568,7 +541,7 @@ protected function verifyDatabaseDetails(array $db, OutputInterface $output) unset($pdo); return true; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $output->writeln( 'PHP Censor could not connect to database with the details provided. ' . 'Please try again.' @@ -583,7 +556,7 @@ protected function verifyDatabaseDetails(array $db, OutputInterface $output) * Write the config.yml file. * @param array $config */ - protected function writeConfigFile(array $config) + private function writeConfigFile(array $config): void { $dumper = new Dumper(); $yaml = $dumper->dump($config, 4); @@ -591,18 +564,18 @@ protected function writeConfigFile(array $config) file_put_contents($this->configPath, $yaml); } - protected function setupDatabase(OutputInterface $output) + private function setupDatabase(OutputInterface $output): bool { $output->write('Setting up your database...'); - exec( + \exec( (ROOT_DIR . 'bin/console php-censor-migrations:migrate'), $outputMigration, $status ); $output->writeln(''); - $output->writeln(implode(PHP_EOL, $outputMigration)); + $output->writeln(\implode(PHP_EOL, $outputMigration)); if (0 == $status) { $output->writeln('OK'); @@ -616,41 +589,29 @@ protected function setupDatabase(OutputInterface $output) /** * Create admin user using information loaded before. - * - * @param array $admin - * @param OutputInterface $output */ - protected function createAdminUser($admin, $output) + protected function createAdminUser(array $admin, InputInterface $input, OutputInterface $output): void { - try { - /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); - $adminUser = $userStore->getByEmail($admin['email']); - if ($adminUser) { - throw new RuntimeException('Admin account already exists!'); - } + /** @var $questionHelper QuestionHelper */ + $questionHelper = $this->getHelperSet()->get('question'); - $userService = new UserService($userStore); - $userService->createUser( - $admin['name'], - $admin['email'], - 'internal', - ['type' => 'internal'], - $admin['password'], - true - ); + /** @var UserStore $userStore */ + $userStore = Factory::getStore('User'); - $output->writeln('User account created!'); - } catch (Exception $ex) { - $output->writeln('PHP Censor failed to create your admin account!'); - $output->writeln('' . $ex->getMessage() . ''); - } + $createAdmin = new CreateAdmin( + $questionHelper, + $input, + $output, + $userStore + ); + + $createAdmin->create($admin); } /** * @param OutputInterface $output */ - protected function createDefaultGroup($output) + protected function createDefaultGroup(OutputInterface $output): void { try { /** @var ProjectGroupStore $projectGroupStore */ @@ -668,18 +629,16 @@ protected function createDefaultGroup($output) Factory::getStore('ProjectGroup')->save($group); $output->writeln('Default project group created!'); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $output->writeln('PHP Censor failed to create default project group!'); $output->writeln('' . $ex->getMessage() . ''); } } - protected function reloadConfig() + protected function reloadConfig(): void { - $config = Config::getInstance(); - - if (file_exists($this->configPath)) { - $config->loadYaml($this->configPath); + if (\file_exists($this->configPath)) { + $config = new Configuration($this->configPath); } } } diff --git a/src/Command/LoggingCommand.php b/src/Command/LoggingCommand.php deleted file mode 100644 index 908fe36b8..000000000 --- a/src/Command/LoggingCommand.php +++ /dev/null @@ -1,74 +0,0 @@ -logger = $logger; - } - - /** - * @param OutputInterface $output - */ - protected function configureLogging(OutputInterface $output) - { - $level = Logger::ERROR; - if ($output->isDebug()) { - $level = Logger::DEBUG; - } elseif ($output->isVeryVerbose()) { - $level = Logger::INFO; - } elseif ($output->isVerbose()) { - $level = Logger::NOTICE; - } - - $handlers = $this->logger->getHandlers(); - foreach ($handlers as $handler) { - if ($handler instanceof AbstractHandler) { - $handler->setLevel($level); - } - } - - if (!$output->isQuiet()) { - $this->logger->pushHandler( - new OutputLogHandler($output, $level) - ); - } - - if ($output->isDebug()) { - $this->logger->notice( - sprintf('Command "%s" started in debug mode (-vvv).', $this->getName()) - ); - - define('DEBUG_MODE', true); - } - } - - /** - * @param InputInterface $input - * @param OutputInterface $output - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - $this->configureLogging($output); - } -} diff --git a/src/Command/RebuildQueueCommand.php b/src/Command/RebuildQueueCommand.php index f45dabc9d..9c4caa571 100644 --- a/src/Command/RebuildQueueCommand.php +++ b/src/Command/RebuildQueueCommand.php @@ -1,44 +1,27 @@ * @author Dan Cryer */ class RebuildQueueCommand extends Command { - /** - * @var OutputInterface - */ - protected $output; - - /** - * @var Logger - */ - protected $logger; - - /** - * @param Logger $logger - * @param string $name - */ - public function __construct(Logger $logger, $name = null) - { - parent::__construct($name); - $this->logger = $logger; - } - protected function configure() { $this @@ -48,16 +31,6 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { - $this->output = $output; - - // For verbose mode we want to output all informational and above - // messages to the symphony output interface. - if ($input->hasOption('verbose') && $input->getOption('verbose')) { - $this->logger->pushHandler( - new OutputLogHandler($this->output, Logger::INFO) - ); - } - /** @var BuildStore $buildStore */ $buildStore = Factory::getStore('Build'); @@ -66,16 +39,16 @@ protected function execute(InputInterface $input, OutputInterface $output) $result = $buildStore->getByStatus(0); - $this->logger->addInfo(sprintf('Found %d builds', count($result['items']))); + $this->logger->info(\sprintf('Found %d builds', \count($result['items']))); - $buildService = new BuildService($buildStore, $projectStore); + $buildService = new BuildService($this->configuration, $buildStore, $projectStore); - while (count($result['items'])) { - $build = array_shift($result['items']); - $build = BuildFactory::getBuild($build); + while (\count($result['items'])) { + $build = \array_shift($result['items']); + $build = BuildFactory::getBuild($this->configuration, $build); $project = $build->getProject(); - $this->logger->addInfo('Added build #' . $build->getId() . ' to queue.'); + $this->logger->info('Added build #' . $build->getId() . ' to queue.'); $buildService->addBuildToQueue( $build, (null !== $project) ? $project->getBuildPriority() : Project::DEFAULT_BUILD_PRIORITY diff --git a/src/Command/RemoveOldBuildsCommand.php b/src/Command/RemoveOldBuildsCommand.php index 030b84d5e..6f5150809 100644 --- a/src/Command/RemoveOldBuildsCommand.php +++ b/src/Command/RemoveOldBuildsCommand.php @@ -1,43 +1,40 @@ * @author David Sloan */ class RemoveOldBuildsCommand extends Command { - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; - /** - * @param ProjectStore $projectStore - * @param BuildService $buildService - */ - public function __construct(ProjectStore $projectStore, BuildService $buildService) - { - parent::__construct(); + public function __construct( + ConfigurationInterface $configuration, + LoggerInterface $logger, + ProjectStore $projectStore, + BuildService $buildService, + ?string $name = null + ) { + parent::__construct($configuration, $logger, $name); - /** @var ProjectStore $projectStore */ $this->projectStore = $projectStore; - - /** @var BuildStore $buildStore */ $this->buildService = $buildService; } @@ -52,11 +49,13 @@ protected function configure() } /** - * Loops through projects. - * - * @param InputInterface $input - * @param OutputInterface $output - */ + * Loops through projects. + * + * @param InputInterface $input + * @param OutputInterface $output + * + * @throws HttpException + */ protected function execute(InputInterface $input, OutputInterface $output) { $projects = $this->projectStore->getAll(); diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 983ab2801..4bbf4be4b 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -1,13 +1,15 @@ * @author Dan Cryer */ -class WorkerCommand extends LoggingCommand +class WorkerCommand extends Command { const MIN_QUEUE_PRIORITY = 24; const MAX_QUEUE_PRIORITY = 2025; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; - /** - * @param Logger $logger - * @param BuildService $buildService - * @param string $name - */ public function __construct( - Logger $logger, + ConfigurationInterface $configuration, + LoggerInterface $logger, BuildService $buildService, - $name = null + ?string $name = null ) { - parent::__construct($logger, $name); + parent::__construct($configuration, $logger, $name); $this->buildService = $buildService; } @@ -75,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { parent::execute($input, $output); - $config = Config::getInstance()->get('php-censor.queue', []); + $config = $this->configuration->get('php-censor.queue', []); if (empty($config['host']) || empty($config['name'])) { throw new RuntimeException( 'The worker is not configured. You must set a host and queue in your config.yml file.' @@ -90,7 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } elseif ('idle' === $value) { $priority = self::MAX_QUEUE_PRIORITY; // low priority, stop late } else { - $msg = sprintf('Invalid value "%s" for --stop-worker, valid are soon, done and idle;', $value); + $msg = \sprintf('Invalid value "%s" for --stop-worker, valid are soon, done and idle;', $value); throw new InvalidArgumentException($msg); } $jobData = []; @@ -100,10 +97,11 @@ protected function execute(InputInterface $input, OutputInterface $output) } (new BuildWorker( + $this->configuration, $this->logger, $this->buildService, $config['host'], - Config::getInstance()->get('php-censor.queue.port', Pheanstalk::DEFAULT_PORT), + $this->configuration->get('php-censor.queue.port', Pheanstalk::DEFAULT_PORT), $config['name'], ($input->hasOption('periodical-work') && $input->getOption('periodical-work')) )) diff --git a/src/Config.php b/src/Config.php deleted file mode 100644 index 7423b46e0..000000000 --- a/src/Config.php +++ /dev/null @@ -1,210 +0,0 @@ -setArray($settings); - } elseif (is_string($settings) && file_exists($settings)) { - $this->loadYaml($settings); - } - } - - /** - * @param string $yamlFile - */ - public function loadYaml($yamlFile) - { - // Path to a YAML file. - $parser = new YamlParser(); - $yaml = file_get_contents($yamlFile); - $config = (array)$parser->parse($yaml); - - if (empty($config)) { - return; - } - - $this->setArray($config); - } - - /** - * Get a configuration value by key, returning a default value if not set. - * - * @param string $key - * @param mixed $default - * - * @return mixed - */ - public function get($key, $default = null) - { - $keyParts = explode('.', $key); - $selected = $this->config; - - $i = -1; - $lastPart = count($keyParts) - 1; - while ($part = array_shift($keyParts)) { - $i++; - - if (!array_key_exists($part, $selected)) { - return $default; - } - - if ($i === $lastPart) { - return $selected[$part]; - } else { - $selected = $selected[$part]; - } - } - - return $default; - } - - /** - * Set a value by key. - * - * @param string $key - * @param mixed $value - * - * @return bool - */ - public function set($key, $value = null) - { - $this->config[$key] = $value; - - return true; - } - - /** - * Set an array of values. - * - * @param $array - */ - public function setArray($array) - { - self::deepMerge($this->config, $array); - } - - /** - * Short-hand syntax for get() - * @see Config::get() - * - * @param string $key - * - * @return mixed - */ - public function __get($key) - { - return $this->get($key); - } - - /** - * Short-hand syntax for set() - * @see Config::set() - * - * @param string $key - * @param mixed $value - * - * @return bool - */ - public function __set($key, $value = null) - { - return $this->set($key, $value); - } - - /** - * Is set - * - * @param string $key - * - * @return bool - */ - public function __isset($key) - { - return isset($this->config[$key]); - } - - /** - * Unset - * - * @param string $key - */ - public function __unset($key) - { - unset($this->config[$key]); - } - - /** - * Deeply merge the $target array onto the $source array. The $source array will be modified! - * - * @param array $source - * @param array $target - */ - public static function deepMerge(&$source, $target) - { - if (count($source) === 0) { - $source = $target; - return; - } - - foreach ($target as $targetKey => $targetValue) { - if (isset($source[$targetKey])) { - if (!is_array($source[$targetKey]) && !is_array($targetValue)) { - // Neither value is an array, overwrite - $source[$targetKey] = $targetValue; - } elseif (is_array($source[$targetKey]) && is_array($targetValue)) { - // Both are arrays, deep merge them - self::deepMerge($source[$targetKey], $targetValue); - } elseif (is_array($source[$targetKey])) { - // Source is the array, push target value - $source[$targetKey][] = $targetValue; - } else { - // Target is the array, push source value and copy back - $targetValue[] = $source[$targetKey]; - $source[$targetKey] = $targetValue; - } - } else { - // No merge required, just set the value - $source[$targetKey] = $targetValue; - } - } - } - - /** - * @return array - */ - public function getArray() - { - return $this->config; - } -} diff --git a/src/Configuration.php b/src/Configuration.php new file mode 100644 index 000000000..9cab8a23a --- /dev/null +++ b/src/Configuration.php @@ -0,0 +1,37 @@ +loadYaml($configurationPath); + } + + parent::__construct($parameters); + } + + /** + * @param string $configurationPath + * + * @return array + */ + private function loadYaml(string $configurationPath): array + { + $parser = new YamlParser(); + $yaml = \file_get_contents($configurationPath); + + return (array)$parser->parse($yaml); + } +} diff --git a/src/ConfigurationInterface.php b/src/ConfigurationInterface.php new file mode 100644 index 000000000..bb678f310 --- /dev/null +++ b/src/ConfigurationInterface.php @@ -0,0 +1,11 @@ +get('php-censor.log.rotate', false); $maxFiles = (int)$applicationConfig->get('php-censor.log.max_files', 0); @@ -74,19 +75,22 @@ protected function initLogger(Config $applicationConfig) } /** - * @param string $name - * @param string $version + * @param ConfigurationInterface $applicationConfig + * @param string $name + * @param string $version * * @throws Exception */ - public function __construct($name = 'PHP Censor', $version = 'UNKNOWN') - { - $version = (string)\trim(\file_get_contents(ROOT_DIR . 'VERSION.md')); + public function __construct( + ConfigurationInterface $applicationConfig, + string $name = 'PHP Censor', + string $version = 'UNKNOWN' + ) { + $version = \trim(\file_get_contents(ROOT_DIR . 'VERSION.md')); $version = !empty($version) ? $version : '0.0.0 (UNKNOWN)'; parent::__construct($name, $version); - $applicationConfig = Config::getInstance(); $oldDatabaseSettings = $applicationConfig->get('b8.database', []); $databaseSettings = $applicationConfig->get('php-censor.database', []); if ($oldDatabaseSettings && !$databaseSettings) { @@ -128,7 +132,7 @@ public function __construct($name = 'PHP Censor', $version = 'UNKNOWN') if (!empty($databaseSettings['type']) && $databaseSettings['type'] === 'pgsql' ) { - if (!array_key_exists('pgsql-sslmode', $databaseSettings['servers']['write'][0])) { + if (!\array_key_exists('pgsql-sslmode', $databaseSettings['servers']['write'][0])) { $databaseSettings['servers']['write'][0]['pgsql-sslmode'] = 'prefer'; } @@ -168,24 +172,19 @@ public function __construct($name = 'PHP Censor', $version = 'UNKNOWN') /** @var BuildStore $buildStore */ $buildStore = Factory::getStore('Build'); - $buildService = new BuildService($buildStore, $projectStore); + $buildService = new BuildService($applicationConfig, $buildStore, $projectStore); $logger = $this->initLogger($applicationConfig); - $this->add(new InstallCommand()); - $this->add(new CreateAdminCommand($userStore)); - $this->add(new CreateBuildCommand($projectStore, $buildService)); - $this->add(new RemoveOldBuildsCommand($projectStore, $buildService)); - $this->add(new WorkerCommand($logger, $buildService)); - $this->add(new RebuildQueueCommand($logger)); - $this->add(new CheckLocalizationCommand()); + $this->add(new InstallCommand($applicationConfig, $logger)); + $this->add(new CreateAdminCommand($applicationConfig, $logger, $userStore)); + $this->add(new CreateBuildCommand($applicationConfig, $logger, $projectStore, $buildService)); + $this->add(new RemoveOldBuildsCommand($applicationConfig, $logger, $projectStore, $buildService)); + $this->add(new WorkerCommand($applicationConfig, $logger, $buildService)); + $this->add(new RebuildQueueCommand($applicationConfig, $logger)); + $this->add(new CheckLocalizationCommand($applicationConfig, $logger)); } - /** - * Returns help. - * - * @return string - */ - public function getHelp() + public function getHelp(): string { return self::LOGO . parent::getHelp(); } @@ -195,8 +194,8 @@ public function getHelp() * * @return string The long application version */ - public function getLongVersion() + public function getLongVersion(): string { - return sprintf('%s v%s', $this->getName(), $this->getVersion()); + return \sprintf('%s v%s', $this->getName(), $this->getVersion()); } } diff --git a/src/Controller.php b/src/Controller.php index 1b5efd3f6..a24c37848 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -10,20 +10,20 @@ abstract class Controller /** * @var Request */ - protected $request; + protected Request $request; /** - * @var Config + * @var ConfigurationInterface */ - protected $config; + protected ConfigurationInterface $configuration; /** - * @param Config $config + * @param ConfigurationInterface $config * @param Request $request */ - public function __construct(Config $config, Request $request) + public function __construct(ConfigurationInterface $config, Request $request) { - $this->config = $config; + $this->configuration = $config; $this->request = $request; } diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 89ceda792..53c4c8865 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -5,7 +5,6 @@ use JasonGrimes\Paginator; use PHPCensor\BuildFactory; use PHPCensor\Exception\HttpException\NotFoundException; -use PHPCensor\Helper\AnsiConverter; use PHPCensor\Helper\Lang; use PHPCensor\Http\Response\JsonResponse; use PHPCensor\Http\Response\RedirectResponse; @@ -18,6 +17,7 @@ use PHPCensor\Store\ProjectStore; use PHPCensor\View; use PHPCensor\WebController; +use SensioLabs\AnsiConverter\AnsiToHtmlConverter; /** * Build Controller - Allows users to run and view builds. @@ -53,7 +53,7 @@ public function init() $this->buildStore = Factory::getStore('Build'); $this->projectStore = Factory::getStore('Project'); - $this->buildService = new BuildService($this->buildStore, $this->projectStore); + $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); } /** @@ -76,7 +76,7 @@ public function view($buildId) $severity = null; } - $build = BuildFactory::getBuildById($buildId); + $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); if (!$build) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); @@ -84,7 +84,7 @@ public function view($buildId) /** @var User $user */ $user = $this->getUser(); - $perPage = $user->getFinalPerPage(); + $perPage = $user->getFinalPerPage($this->configuration); $data = $this->getBuildData($build, $plugin, $severity, $isNew, (($page - 1) * $perPage), $perPage); $pages = ($data['errors'] === 0) ? 1 @@ -285,7 +285,7 @@ protected function getPaginatorHtml($buildId, $plugin, $severity, $isNew, $total */ public function rebuild($buildId) { - $copy = BuildFactory::getBuildById($buildId); + $copy = BuildFactory::getBuildById($this->configuration, (int)$buildId); $project = Factory::getStore('Project')->getByPrimaryKey($copy->getProjectId()); if (!$copy || $project->getArchived()) { @@ -319,7 +319,7 @@ public function delete($buildId) { $this->requireAdmin(); - $build = BuildFactory::getBuildById($buildId); + $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); if (!$build) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); @@ -338,7 +338,9 @@ public function delete($buildId) */ protected function cleanLog($log) { - return AnsiConverter::convert($log); + $converter = new AnsiToHtmlConverter(null, false); + + return $converter->convert($log); } /** @@ -379,7 +381,7 @@ public function ajaxData($buildId) } $response = new JsonResponse(); - $build = BuildFactory::getBuildById($buildId); + $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); if (!$build) { $response->setResponseCode(404); @@ -414,7 +416,7 @@ public function ajaxData($buildId) public function ajaxMeta($buildId) { - $build = BuildFactory::getBuildById($buildId); + $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); $key = $this->getParam('key', null); $numBuilds = $this->getParam('num_builds', 1); $data = null; diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 298cf0109..6900da021 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -142,7 +142,7 @@ protected function getLatestBuilds($projectId, $branch) $builds = $this->buildStore->getWhere($criteria, 10, 0, $order); foreach ($builds['items'] as &$build) { - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); } return $builds['items']; diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index f58b26452..3b0b8da0c 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -2,7 +2,6 @@ namespace PHPCensor\Controller; -use PHPCensor\Config; use PHPCensor\Helper\Lang; use PHPCensor\WebController; @@ -28,7 +27,7 @@ public function index() 'right' => [], ]; - $widgetsConfig = Config::getInstance()->get('php-censor.dashboard_widgets', [ + $widgetsConfig = $this->configuration->get('php-censor.dashboard_widgets', [ 'all_projects' => [ 'side' => 'left', ], diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index c489c63fb..206ad1bbf 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -65,7 +65,7 @@ public function init() $this->buildStore = Factory::getStore('Build'); $this->projectStore = Factory::getStore('Project'); $this->projectService = new ProjectService($this->projectStore); - $this->buildService = new BuildService($this->buildStore, $this->projectStore); + $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); } /** @@ -115,7 +115,7 @@ public function view($projectId) /** @var PHPCensor\Model\User $user */ $user = $this->getUser(); - $perPage = $user->getFinalPerPage(); + $perPage = $user->getFinalPerPage($this->configuration); $builds = $this->getLatestBuildsHtml($projectId, $branch, $environment, (($page - 1) * $perPage), $perPage); $pages = ($builds[1] === 0) ? 1 @@ -362,7 +362,7 @@ protected function getLatestBuildsHtml($projectId, $branch = '', $environment = $view = new View('Project/ajax-builds'); foreach ($builds['items'] as &$build) { - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); } $view->builds = $builds['items']; @@ -386,7 +386,7 @@ public function add() $values['default_branch'] = null; if ($method !== 'POST') { - $sshKey = new SshKey(); + $sshKey = new SshKey($this->configuration); $key = $sshKey->generate(); $values['ssh_private_key'] = $key['ssh_private_key']; diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index d420bd587..89ef4fae3 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -2,7 +2,6 @@ namespace PHPCensor\Controller; -use PHPCensor\Config; use PHPCensor\Exception\HttpException; use PHPCensor\Form; use PHPCensor\Form\Element\Checkbox; @@ -48,7 +47,7 @@ public function init() parent::init(); $this->userStore = Factory::getStore('User'); - $this->authentication = Service::getInstance(); + $this->authentication = new Service($this->configuration); } protected function loginForm($values) @@ -225,7 +224,7 @@ public function forgotPassword() $key = md5(date('Y-m-d') . $user->getHash()); $message = Lang::get('reset_email_body', $user->getName(), APP_URL, $user->getId(), $key); - $email = new Email(Config::getInstance()); + $email = new Email($this->configuration); $email->setEmailTo($user->getEmail(), $user->getName()); $email->setSubject(Lang::get('reset_email_title', $user->getName())); $email->setBody($message); diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index a2683f95e..cfdab5ced 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -2,7 +2,6 @@ namespace PHPCensor\Controller; -use PHPCensor\Config; use PHPCensor\Exception\HttpException\ForbiddenException; use PHPCensor\Exception\HttpException\NotFoundException; use PHPCensor\Form; @@ -130,7 +129,7 @@ public function profile() $language->setRequired(true); $language->setOptions( array_merge( - [null => Lang::get('default') . ' (' . Config::getInstance()->get('php-censor.language') . ')'], + [null => Lang::get('default') . ' (' . $this->configuration->get('php-censor.language') . ')'], Lang::getLanguageOptions() ) ); @@ -143,7 +142,7 @@ public function profile() $perPage->setLabel(Lang::get('per_page')); $perPage->setRequired(true); $perPage->setOptions([ - null => Lang::get('default') . ' (' . Config::getInstance()->get('php-censor.per_page') . ')', + null => Lang::get('default') . ' (' . $this->configuration->get('php-censor.per_page') . ')', 10 => 10, 25 => 25, 50 => 50, diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index c14baedb6..42d18d675 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -4,7 +4,6 @@ use Exception; use GuzzleHttp\Client; -use PHPCensor\Config; use PHPCensor\Controller; use PHPCensor\Exception\HttpException\NotFoundException; use PHPCensor\Exception\InvalidArgumentException; @@ -55,7 +54,7 @@ public function init() $this->buildStore = Factory::getStore('Build'); $this->projectStore = Factory::getStore('Project'); - $this->buildService = new BuildService($this->buildStore, $this->projectStore); + $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); } /** @@ -526,8 +525,8 @@ protected function bitbucketPullRequest(Project $project, array $payload) ]; } - $username = Config::getInstance()->get('php-censor.bitbucket.username'); - $appPassword = Config::getInstance()->get('php-censor.bitbucket.app_password'); + $username = $this->configuration->get('php-censor.bitbucket.username'); + $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword)) { throw new Exception('Please provide Username and App Password of your Bitbucket account.'); @@ -810,7 +809,7 @@ protected function githubPullRequest(Project $project, array $payload) } $headers = []; - $token = Config::getInstance()->get('php-censor.github.token'); + $token = $this->configuration->get('php-censor.github.token'); if (!empty($token)) { $headers['Authorization'] = 'token ' . $token; @@ -819,7 +818,7 @@ protected function githubPullRequest(Project $project, array $payload) $url = $payload['pull_request']['commits_url']; //for large pull requests, allow grabbing more then the default number of commits - $customPerPage = Config::getInstance()->get('php-censor.github.per_page'); + $customPerPage = $this->configuration->get('php-censor.github.per_page'); $params = []; if ($customPerPage) { $params['per_page'] = $customPerPage; diff --git a/src/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php index 26efe1470..94119b892 100644 --- a/src/Controller/WidgetLastBuildsController.php +++ b/src/Controller/WidgetLastBuildsController.php @@ -37,7 +37,7 @@ public function index() $builds = $this->buildStore->getLatestBuilds(null, 10); foreach ($builds as &$build) { - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); } $view = new View('WidgetLastBuilds/update'); @@ -59,7 +59,7 @@ public function update() $builds = $this->buildStore->getLatestBuilds(null, 10); foreach ($builds as &$build) { - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); } $this->view->builds = $builds; diff --git a/src/Database.php b/src/Database.php index 4fbcb1e71..bc5da78d2 100644 --- a/src/Database.php +++ b/src/Database.php @@ -17,10 +17,9 @@ class Database extends PDO */ protected $type = 'read'; - /** - * @var bool - */ - protected static $initialised = false; + protected static bool $initialised = false; + + public static ConfigurationInterface $configuration; /** * @var array @@ -64,8 +63,7 @@ public function lastInsertIdExtended($table = null) protected static function init() { - $config = Config::getInstance(); - $settings = $config->get('php-censor.database', []); + $settings = self::$configuration->get('php-censor.database', []); self::$servers['read'] = $settings['servers']['read']; self::$servers['write'] = $settings['servers']['write']; diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php new file mode 100644 index 000000000..aa8dd4b35 --- /dev/null +++ b/src/DatabaseConnection.php @@ -0,0 +1,107 @@ +sequencePattern = $sequencePattern; + $this->pdoConnection = new \PDO($dsn, $username, $password, $options); + } + + public function getPdo(): \PDO + { + return $this->pdoConnection; + } + + public function quoteNames(string $query): string + { + $driver = $this->pdoConnection->getAttribute(\PDO::ATTR_DRIVER_NAME); + $pattern = '\1'; + if (DatabaseManager::MYSQL_TYPE === $driver) { + $pattern = '`\1`'; + } elseif (DatabaseManager::MYSQL_TYPE === $driver) { + $pattern = '"\1"'; + } + + return \preg_replace('#{{(.*?)}}#m', $pattern, $query); + } + + public function lastInsertId(string $tableName): int + { + if (DatabaseManager::POSTGRESQL_TYPE === $this->pdoConnection->getAttribute(\PDO::ATTR_DRIVER_NAME)) { + return (int)$this->pdoConnection->lastInsertId(\sprintf("\"{$this->sequencePattern}\"", $tableName)); + } + + return (int)$this->pdoConnection->lastInsertId(); + } + + /** + * @param string $query + * @param array $options + * + * @return false|\PDOStatement + */ + public function prepare(string $query, array $options = []) + { + return $this->pdoConnection->prepare($this->quoteNames($query), $options); + } + + /** + * @param string $statement + * + * @return int|false + */ + public function exec(string $statement) + { + return $this->pdoConnection->exec($statement); + } + + /** + * @param string $statement + * + * @return false|\PDOStatement + */ + public function query(string $statement) + { + return $this->pdoConnection->query($statement); + } + + public function beginTransaction(): bool + { + return $this->pdoConnection->beginTransaction(); + } + + public function commit(): bool + { + return $this->pdoConnection->commit(); + } + + public function rollBack(): bool + { + return $this->pdoConnection->rollBack(); + } + + public function inTransaction(): bool + { + return $this->pdoConnection->inTransaction(); + } +} diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php new file mode 100644 index 000000000..ef7317451 --- /dev/null +++ b/src/DatabaseManager.php @@ -0,0 +1,103 @@ + null, + 'write' => null + ]; + + public function __construct(ConfigurationInterface $configuration) + { + $this->configuration = $configuration; + } + + /** + * @param string $type + * + * @return \PDO + * + * @throws Exception + */ + public function getConnection(string $type = 'read'): \PDO + { + if (null === $this->connections[$type]) { + $servers = (array)$this->configuration->get("php-censor.database.servers.{$type}", []); + \shuffle($servers); + + $connection = null; + while (\count($servers)) { + $server = \array_shift($servers); + $driver = $this->configuration->get('php-censor.database.type', self::POSTGRESQL_TYPE); + $dsn = $driver . ':host=' . $server['host']; + + if (self::POSTGRESQL_TYPE === $driver) { + if (!\array_key_exists('pgsql-sslmode', $server)) { + $server['pgsql-sslmode'] = 'prefer'; + } + + $dsn .= ';sslmode=' . $server['pgsql-sslmode']; + } + + if (isset($server['port'])) { + $dsn .= ';port=' . (int)$server['port']; + } + + $dsn .= ';dbname=' . $this->configuration->get('php-censor.database.name', ''); + + $pdoOptions = [ + \PDO::ATTR_PERSISTENT => false, + \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, + \PDO::ATTR_TIMEOUT => 2, + ]; + + if (self::MYSQL_TYPE === $driver) { + $pdoOptions[\PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'"; + } + + try { + $connection = new DatabaseConnection( + $dsn, + $this->configuration->get('php-censor.database.username', ''), + $this->configuration->get('php-censor.database.password', ''), + $pdoOptions + ); + } catch (\PDOException $ex) { + $connection = false; + } + + if ($connection) { + break; + } + } + + // No connection? Oh dear. + if (!$connection && $type === 'read') { + throw new Exception('Could not connect to any ' . $type . ' servers.'); + } + + $this->connections[$type] = $connection; + } + + return $this->connections[$type]; + } + + public function resetConnections(): void + { + $this->connections = [ + 'read' => null, + 'write' => null + ]; + } +} diff --git a/src/Form/DataTransformer/Yaml.php b/src/Form/DataTransformer/Yaml.php index 5e923f8d4..74c2b52c7 100644 --- a/src/Form/DataTransformer/Yaml.php +++ b/src/Form/DataTransformer/Yaml.php @@ -1,9 +1,9 @@ convert($text); - } - - /** - * Do not instantiate this class. - */ - private function __construct() - { - } -} diff --git a/src/Helper/Bitbucket.php b/src/Helper/Bitbucket.php index 135b3bdc4..e80d769cb 100644 --- a/src/Helper/Bitbucket.php +++ b/src/Helper/Bitbucket.php @@ -3,13 +3,20 @@ namespace PHPCensor\Helper; use GuzzleHttp\Client; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; /** * The Bitbucket Helper class provides some Bitbucket API call functionality. */ class Bitbucket { + private ConfigurationInterface $configuration; + + public function __construct(ConfigurationInterface $configuration) + { + $this->configuration = $configuration; + } + /** * Create a comment on a specific file (and commit) in a Bitbucket Pull Request. * @@ -24,8 +31,8 @@ class Bitbucket */ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line, $comment) { - $username = Config::getInstance()->get('php-censor.bitbucket.username'); - $appPassword = Config::getInstance()->get('php-censor.bitbucket.app_password'); + $username = $this->configuration->get('php-censor.bitbucket.username'); + $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword)) { return; @@ -65,8 +72,8 @@ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line */ public function createCommitComment($repo, $commitId, $file, $line, $comment) { - $username = Config::getInstance()->get('php-censor.bitbucket.username'); - $appPassword = Config::getInstance()->get('php-censor.bitbucket.app_password'); + $username = $this->configuration->get('php-censor.bitbucket.username'); + $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword)) { return; @@ -102,8 +109,8 @@ public function createCommitComment($repo, $commitId, $file, $line, $comment) */ public function getPullRequestDiff($repo, $pullRequestId) { - $username = Config::getInstance()->get('php-censor.bitbucket.username'); - $appPassword = Config::getInstance()->get('php-censor.bitbucket.app_password'); + $username = $this->configuration->get('php-censor.bitbucket.username'); + $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword)) { return; diff --git a/src/Helper/Email.php b/src/Helper/Email.php index 769f487e0..0a66a0ede 100644 --- a/src/Helper/Email.php +++ b/src/Helper/Email.php @@ -3,7 +3,7 @@ namespace PHPCensor\Helper; use PHPCensor\Builder; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; use Swift_Message; /** @@ -21,9 +21,9 @@ class Email protected $config; /** - * @param Config $config + * @param ConfigurationInterface $config */ - public function __construct(Config $config) + public function __construct(ConfigurationInterface $config) { $this->config = $config; } diff --git a/src/Helper/Github.php b/src/Helper/Github.php index b89f1e4f7..ad5dd9d2a 100644 --- a/src/Helper/Github.php +++ b/src/Helper/Github.php @@ -3,13 +3,20 @@ namespace PHPCensor\Helper; use GuzzleHttp\Client; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; /** * The Github Helper class provides some Github API call functionality. */ class Github { + private ConfigurationInterface $configuration; + + public function __construct(ConfigurationInterface $configuration) + { + $this->configuration = $configuration; + } + /** * Create a comment on a specific file (and commit) in a Github Pull Request. * @param $repo @@ -22,7 +29,7 @@ class Github */ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line, $comment) { - $token = Config::getInstance()->get('php-censor.github.token'); + $token = $this->configuration->get('php-censor.github.token'); if (!$token) { return null; @@ -58,7 +65,7 @@ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line */ public function createCommitComment($repo, $commitId, $file, $line, $comment) { - $token = Config::getInstance()->get('php-censor.github.token'); + $token = $this->configuration->get('php-censor.github.token'); if (!$token) { return null; diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index 265d9fa6b..e45d19fd0 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -2,7 +2,7 @@ namespace PHPCensor\Helper; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; @@ -113,10 +113,10 @@ public static function getStrings() /** * Initialise the Language helper, try load the language file for the user's browser or the configured default. * - * @param Config $config - * @param string $languageForce + * @param ConfigurationInterface $config + * @param string $languageForce */ - public static function init(Config $config, $languageForce = null) + public static function init(ConfigurationInterface $config, $languageForce = null) { self::$defaultStrings = self::loadLanguage(self::DEFAULT_LANGUAGE); self::loadAvailableLanguages(); diff --git a/src/Helper/SshKey.php b/src/Helper/SshKey.php index ef74f9ee5..43ea52e08 100644 --- a/src/Helper/SshKey.php +++ b/src/Helper/SshKey.php @@ -2,13 +2,20 @@ namespace PHPCensor\Helper; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; /** * Helper class for dealing with SSH keys. */ class SshKey { + protected ConfigurationInterface $configuration; + + public function __construct(ConfigurationInterface $configuration) + { + $this->configuration = $configuration; + } + /** * Uses ssh-keygen to generate a public/private key pair. * @@ -28,8 +35,8 @@ public function generate() 'ssh_public_key' => '' ]; - $sshStrength = Config::getInstance()->get('php-censor.ssh.strength', 2048); - $sshComment = Config::getInstance()->get('php-censor.ssh.comment', 'admin@php-censor'); + $sshStrength = $this->configuration->get('php-censor.ssh.strength', 2048); + $sshComment = $this->configuration->get('php-censor.ssh.comment', 'admin@php-censor'); $output = @\shell_exec( \sprintf( diff --git a/src/Http/Router.php b/src/Http/Router.php index da0427f16..c0a6557c9 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -3,7 +3,6 @@ namespace PHPCensor\Http; use PHPCensor\Application; -use PHPCensor\Config; use PHPCensor\Exception\InvalidArgumentException; class Router @@ -11,28 +10,22 @@ class Router /** * @var Request; */ - protected $request; - - /** - * @var Config; - */ - protected $config; + protected Request $request; /** * @var Application */ - protected $application; + protected Application $application; /** * @var array */ protected $routes = [['route' => '/:controller/:action', 'callback' => null, 'defaults' => []]]; - public function __construct(Application $application, Request $request, Config $config) + public function __construct(Application $application, Request $request) { $this->application = $application; $this->request = $request; - $this->config = $config; } public function clearRoutes() diff --git a/src/Logging/AnsiFormatter.php b/src/Logging/AnsiFormatter.php index e71967f5d..7ce67f41b 100644 --- a/src/Logging/AnsiFormatter.php +++ b/src/Logging/AnsiFormatter.php @@ -1,5 +1,7 @@ logger = $logger; $this->build = $build; } - /** - * Add an entry to the build log. - * - * @param string|string[] $message - * @param string $level - * @param mixed[] $context - */ - public function log($message, $level = LogLevel::INFO, $context = []) + public function log($message, string $level = LogLevel::INFO, array $context = []): void { - // Skip if no logger has been loaded. - if (!$this->logger) { - return; - } - - if (!is_array($message)) { + if (!\is_array($message)) { $message = [$message]; } - // The build is added to the context so the logger can use - // details from it if required. $context['build'] = $this->build->getId(); foreach ($message as $item) { @@ -60,39 +33,21 @@ public function log($message, $level = LogLevel::INFO, $context = []) } } - /** - * Add a warning-coloured message to the log. - * - * @param string $message - */ - public function logWarning($message) + public function logWarning(string $message): void { $this->log("\033[0;31m" . $message . "\033[0m"); } - /** - * Add a success-coloured message to the log. - * - * @param string $message - */ - public function logSuccess($message) + public function logSuccess(string $message): void { $this->log("\033[0;32m" . $message . "\033[0m"); } - /** - * Add a failure-coloured message to the log. - * - * @param string $message - * @param Exception $exception The exception that caused the error. - */ - public function logFailure($message, Exception $exception = null) + public function logFailure(string $message, ?\Throwable $exception = null): void { $level = LogLevel::INFO; $context = []; - // The psr3 log interface stipulates that exceptions should be passed - // as the exception key in the context array. if ($exception) { $level = LogLevel::ERROR; @@ -103,25 +58,10 @@ public function logFailure($message, Exception $exception = null) $this->log("\033[0;31m" . $message . "\033[0m", $level, $context); } - /** - * Add a debug-coloured message to the log. - * - * @param string $message - */ - public function logDebug($message) + public function logDebug(string $message): void { if ($this->build->isDebug()) { $this->log("\033[0;36m" . $message . "\033[0m", LogLevel::DEBUG); } } - - /** - * Sets a logger instance on the object - * - * @param LoggerInterface $logger - */ - public function setLogger(LoggerInterface $logger) - { - $this->logger = $logger; - } } diff --git a/src/Logging/OutputLogHandler.php b/src/Logging/OutputLogHandler.php index 3a3e61f23..f2dabe98e 100644 --- a/src/Logging/OutputLogHandler.php +++ b/src/Logging/OutputLogHandler.php @@ -1,5 +1,7 @@ get('php-censor.bitbucket.username'); - $appPassword = Config::getInstance()->get('php-censor.bitbucket.app_password'); + $username = $this->configuration->get('php-censor.bitbucket.username'); + $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword) || empty($this->data['id'])) { return false; } - $allowStatusCommit = (bool)Config::getInstance()->get( + $allowStatusCommit = (bool)$this->configuration->get( 'php-censor.bitbucket.status.commit', false ); @@ -123,7 +122,7 @@ public function sendStatusPostback() break; } - $phpCensorUrl = Config::getInstance()->get('php-censor.url'); + $phpCensorUrl = $this->configuration->get('php-censor.url'); $url = sprintf( '/2.0/repositories/%s/commit/%s/statuses/build', @@ -151,7 +150,7 @@ public function sendStatusPostback() ], ]); - $status = (int)$response->getStatusCode(); + $status = $response->getStatusCode(); return ($status >= 200 && $status < 300); } @@ -203,7 +202,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul try { if (in_array($this->getSource(), Build::$pullRequestSources, true)) { - $helper = new Bitbucket(); + $helper = new Bitbucket($this->configuration); $diff = $helper->getPullRequestDiff( $this->getProject()->getReference(), $this->getExtra('pull_request_number') @@ -263,12 +262,12 @@ public function reportError( parent::reportError($builder, $plugin, $message, $severity, $file, $lineStart, $lineEnd); try { - $allowCommentCommit = (bool)Config::getInstance()->get( + $allowCommentCommit = (bool)$this->configuration->get( 'php-censor.bitbucket.comments.commit', false ); - $allowCommentPullRequest = (bool)Config::getInstance()->get( + $allowCommentPullRequest = (bool)$this->configuration->get( 'php-censor.bitbucket.comments.pull_request', false ); @@ -278,7 +277,7 @@ public function reportError( $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart); if (!is_null($diffLineNumber)) { - $helper = new Bitbucket(); + $helper = new Bitbucket($this->configuration); $repo = $this->getProject()->getReference(); $prNumber = $this->getExtra('pull_request_number'); diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 503cc1e34..10a19c9fb 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\ConfigurationInterface; use PHPCensor\Model\Build; use Psr\Log\LogLevel; @@ -14,6 +15,17 @@ */ class GitBuild extends Build { + protected ConfigurationInterface $configuration; + + public function __construct( + ConfigurationInterface $configuration, + array $initialData = [] + ) { + parent::__construct($initialData); + + $this->configuration = $configuration; + } + /** * Get the URL to be used to clone this remote repository. * diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 0b23c3124..9fb5192a8 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -5,7 +5,7 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Config; +use PHPCensor\Configuration; use PHPCensor\Helper\Diff; use PHPCensor\Helper\Github; use PHPCensor\Model\Build; @@ -100,12 +100,12 @@ public function sendStatusPostback() return false; } - $token = Config::getInstance()->get('php-censor.github.token'); + $token = $this->configuration->get('php-censor.github.token'); if (empty($token) || empty($this->data['id'])) { return false; } - $allowStatusCommit = (bool)Config::getInstance()->get( + $allowStatusCommit = (bool)$this->configuration->get( 'php-censor.github.status.commit', false ); @@ -134,7 +134,7 @@ public function sendStatusPostback() break; } - $phpCensorUrl = Config::getInstance()->get('php-censor.url'); + $phpCensorUrl = $this->configuration->get('php-censor.url'); $url = '/repos/' . $project->getReference() . '/statuses/' . $this->getCommitId(); $client = new Client([ @@ -274,12 +274,12 @@ public function reportError( parent::reportError($builder, $plugin, $message, $severity, $file, $lineStart, $lineEnd); try { - $allowCommentCommit = (bool)Config::getInstance()->get( + $allowCommentCommit = (bool)$this->configuration->get( 'php-censor.github.comments.commit', false ); - $allowCommentPullRequest = (bool)Config::getInstance()->get( + $allowCommentPullRequest = (bool)$this->configuration->get( 'php-censor.github.comments.pull_request', false ); @@ -289,7 +289,7 @@ public function reportError( $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart); if (!is_null($diffLineNumber)) { - $helper = new Github(); + $helper = new Github($this->configuration); $repo = $this->getProject()->getReference(); $prNumber = $this->getExtra('pull_request_number'); diff --git a/src/Model/User.php b/src/Model/User.php index ddeaef3a7..5e4b8b372 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -2,7 +2,7 @@ namespace PHPCensor\Model; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; use PHPCensor\Model\Base\User as BaseUser; /** @@ -10,16 +10,13 @@ */ class User extends BaseUser { - /** - * @return int - */ - public function getFinalPerPage() + public function getFinalPerPage(ConfigurationInterface $configuration): int { $perPage = $this->getPerPage(); if ($perPage) { return $perPage; } - return (int)Config::getInstance()->get('php-censor.per_page', 10); + return (int)$configuration->get('php-censor.per_page', 10); } } diff --git a/src/Plugin/EmailNotify.php b/src/Plugin/EmailNotify.php index c735367e3..caec69c51 100644 --- a/src/Plugin/EmailNotify.php +++ b/src/Plugin/EmailNotify.php @@ -2,7 +2,7 @@ namespace PHPCensor\Plugin; -use PHPCensor\Config; +use PHPCensor\Configuration; use PHPCensor\Exception\HttpException; use PHPCensor\Helper\Email as EmailHelper; use PHPCensor\Plugin; @@ -87,7 +87,7 @@ public function execute() */ protected function sendEmail($toAddress, $ccList, $subject, $body) { - $email = new EmailHelper(Config::getInstance()); + $email = new EmailHelper($this->builder->getConfiguration()); $email->setEmailTo($toAddress, $toAddress); $email->setSubject($subject); diff --git a/src/Plugin/Option/PhpUnitOptions.php b/src/Plugin/Option/PhpUnitOptions.php index 866065e6a..30babfeb6 100644 --- a/src/Plugin/Option/PhpUnitOptions.php +++ b/src/Plugin/Option/PhpUnitOptions.php @@ -2,8 +2,7 @@ namespace PHPCensor\Plugin\Option; -use PHPCensor\Builder; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; /** * Class PhpUnitOptions validates and parse the option for the PhpUnitV2 plugin @@ -12,29 +11,24 @@ */ class PhpUnitOptions { - /** - * @var array - */ - protected $options; + protected array $options; - /** - * @var string - */ - protected $location; + protected string $location; - /** - * @var array - */ - protected $arguments = []; + protected array $arguments = []; + + protected ConfigurationInterface $configuration; /** - * @param array $options - * @param string $location + * @param ConfigurationInterface $configuration + * @param array $options + * @param string $location */ - public function __construct($options, $location) + public function __construct(ConfigurationInterface $configuration, array $options, string $location) { - $this->options = $options; - $this->location = $location; + $this->configuration = $configuration; + $this->options = $options; + $this->location = $location; } /** @@ -123,7 +117,7 @@ private function parseArguments() * Handles command aliases outside of the args option */ if (isset($this->options['coverage']) && $this->options['coverage']) { - $allowPublicArtifacts = (bool)Config::getInstance()->get( + $allowPublicArtifacts = (bool)$this->configuration->get( 'php-censor.build.allow_public_artifacts', false ); diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index 2f80ab4ad..6d078be23 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Config; +use PHPCensor\Configuration; use PHPCensor\Model\Build; use PHPCensor\Plugin; use Symfony\Component\Filesystem\Filesystem; @@ -86,7 +86,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) */ public function execute() { - $allowPublicArtifacts = (bool)Config::getInstance()->get( + $allowPublicArtifacts = (bool)$this->builder->getConfiguration()->get( 'php-censor.build.allow_public_artifacts', false ); diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index 0c0c35cbb..ba61e6c49 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -5,7 +5,6 @@ use Exception; use PHPCensor; use PHPCensor\Builder; -use PHPCensor\Config; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; @@ -14,6 +13,7 @@ use PHPCensor\Plugin\Util\PhpUnitResultJunit; use PHPCensor\ZeroConfigPluginInterface; use Symfony\Component\Filesystem\Filesystem; +use PHPCensor\Configuration; /** * PHP Unit Plugin - A rewrite of the original PHP Unit plugin @@ -81,7 +81,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->buildLocation = PUBLIC_DIR . 'artifacts/phpunit/' . $this->buildDirectory; $this->buildBranchLocation = PUBLIC_DIR . 'artifacts/phpunit/' . $this->buildBranchDirectory; - $this->options = new PhpUnitOptions($options, $this->buildLocation); + $this->options = new PhpUnitOptions($this->builder->getConfiguration(), $options, $this->buildLocation); $this->executable = $this->findBinary(['phpunit', 'phpunit.phar']); } @@ -152,7 +152,7 @@ public function execute() */ protected function runConfig($directory, $configFile, $logFormat) { - $allowPublicArtifacts = (bool)Config::getInstance()->get( + $allowPublicArtifacts = (bool)$this->builder->getConfiguration()->get( 'php-censor.build.allow_public_artifacts', false ); diff --git a/src/ProcessControl/Factory.php b/src/ProcessControl/Factory.php deleted file mode 100644 index 13bf37c6e..000000000 --- a/src/ProcessControl/Factory.php +++ /dev/null @@ -1,54 +0,0 @@ - - */ -class Factory -{ - /** - * ProcessControl singleton. - * - * @var ProcessControlInterface - */ - protected static $instance = null; - - /** - * Returns the ProcessControl singleton. - * - * @return ProcessControlInterface - */ - public static function getInstance() - { - if (static::$instance === null) { - static::$instance = static::createProcessControl(); - } - return static::$instance; - } - - /** - * Create a ProcessControl depending on available extensions and the underlying OS. - * - * Check PosixProcessControl, WindowsProcessControl and UnixProcessControl, in that order. - * - * @return ProcessControlInterface - * - * @throws Exception - */ - public static function createProcessControl() - { - switch (true) { - case PosixProcessControl::isAvailable(): - return new PosixProcessControl(); - case UnixProcessControl::isAvailable(): - return new UnixProcessControl(); - } - - throw new Exception("No ProcessControl implementation available."); - } -} diff --git a/src/ProcessControl/PosixProcessControl.php b/src/ProcessControl/PosixProcessControl.php deleted file mode 100644 index f2c13e755..000000000 --- a/src/ProcessControl/PosixProcessControl.php +++ /dev/null @@ -1,42 +0,0 @@ - - */ -class PosixProcessControl implements ProcessControlInterface -{ - /** - * @param int $pid - * - * @return bool - */ - public function isRunning($pid) - { - // Signal "0" is not sent to the process, but posix_kill checks the process anyway; - return posix_kill($pid, 0); - } - - /** - * {@inheritdoc} - */ - public function kill($pid, $forcefully = false) - { - return posix_kill($pid, $forcefully ? 9 : 15); - } - - /** - * Check whether this posix_kill is available. - * - * @return bool - * - * @internal - */ - public static function isAvailable() - { - return function_exists('posix_kill'); - } -} diff --git a/src/ProcessControl/ProcessControlInterface.php b/src/ProcessControl/ProcessControlInterface.php deleted file mode 100644 index e3fce8c89..000000000 --- a/src/ProcessControl/ProcessControlInterface.php +++ /dev/null @@ -1,30 +0,0 @@ - - */ -interface ProcessControlInterface -{ - /** - * Checks if a process exists. - * - * @param int $pid The process identifier. - * - * @return bool true is the process is running, else false. - */ - public function isRunning($pid); - - /** - * Terminate a running process. - * - * @param int $pid The process identifier. - * @param bool $forcefully Whether to gently (false) or forcefully (true) terminate the process. - * - * @return bool - */ - public function kill($pid, $forcefully = false); -} diff --git a/src/ProcessControl/UnixProcessControl.php b/src/ProcessControl/UnixProcessControl.php deleted file mode 100644 index 6733e9072..000000000 --- a/src/ProcessControl/UnixProcessControl.php +++ /dev/null @@ -1,50 +0,0 @@ - - */ -class UnixProcessControl implements ProcessControlInterface -{ - /** - * Check process using the "ps" command. - * - * @param int $pid - * - * @return bool - */ - public function isRunning($pid) - { - $output = $exitCode = null; - exec(sprintf("ps %d", $pid), $output, $exitCode); - return $exitCode === 0; - } - - /** - * {@inheritdoc} - */ - public function kill($pid, $forcefully = false) - { - $output = []; - $result = 1; - - exec(sprintf("kill -%d %d", $forcefully ? 9 : 15, $pid), $output, $result); - - return !$result; - } - - /** - * Check whether the commands "ps" and "kill" are available. - * - * @return bool - * - * @internal - */ - public static function isAvailable() - { - return DIRECTORY_SEPARATOR === '/' && exec("which ps") && exec("which kill"); - } -} diff --git a/src/Security/Authentication/Service.php b/src/Security/Authentication/Service.php index 1cee22982..cd3cca102 100644 --- a/src/Security/Authentication/Service.php +++ b/src/Security/Authentication/Service.php @@ -2,7 +2,8 @@ namespace PHPCensor\Security\Authentication; -use PHPCensor\Config; +use PHPCensor\Configuration; +use PHPCensor\ConfigurationInterface; /** * Authentication facade. @@ -12,19 +13,16 @@ class Service { /** - * @var Service - */ - private static $instance; - - /** - * Return the service singleton. + * The table of providers. * - * @return Service + * @var array */ - public static function getInstance() + private array $providers; + + public function __construct(ConfigurationInterface $configuration, array $providers = []) { - if (self::$instance === null) { - $config = Config::getInstance()->get( + if (!$providers) { + $config = $configuration->get( 'php-censor.security.auth_providers', [ 'internal' => [ @@ -37,10 +35,9 @@ public static function getInstance() foreach ($config as $key => $providerConfig) { $providers[$key] = self::buildProvider($key, $providerConfig); } - self::$instance = new self($providers); } - return self::$instance; + $this->providers = $providers; } /** @@ -61,23 +58,6 @@ public static function buildProvider($key, $config) return new $class($key, $config); } - /** - * The table of providers. - * - * @var array - */ - private $providers; - - /** - * Initialize the service. - * - * @param array $providers - */ - public function __construct(array $providers) - { - $this->providers = $providers; - } - /** * Return all providers. * diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 1fe3d6ce7..1a477f423 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -9,7 +9,7 @@ use Pheanstalk\Pheanstalk; use Pheanstalk\Contract\PheanstalkInterface; use PHPCensor\BuildFactory; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; use PHPCensor\Exception\HttpException; use PHPCensor\Model\Build; use PHPCensor\Model\Project; @@ -25,31 +25,22 @@ */ class BuildService { - /** - * @var BuildStore - */ - protected $buildStore; + private BuildStore $buildStore; - /** - * @var ProjectStore - */ - protected $projectStore; + private ProjectStore $projectStore; - /** - * @var bool - */ - public $queueError = false; + private ConfigurationInterface $configuration; + + public bool $queueError = false; - /** - * @param BuildStore $buildStore - * @param ProjectStore $projectStore - */ public function __construct( + ConfigurationInterface $configuration, BuildStore $buildStore, ProjectStore $projectStore ) { - $this->buildStore = $buildStore; - $this->projectStore = $projectStore; + $this->configuration = $configuration; + $this->buildStore = $buildStore; + $this->projectStore = $projectStore; } /** @@ -123,7 +114,7 @@ public function createBuild( if (!empty($buildId)) { $project = $build->getProject(); - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); $build->sendStatusPostback(); $this->addBuildToQueue( $build, @@ -273,7 +264,7 @@ public function createDuplicateBuild(Build $originalBuild, $source) $buildId = $build->getId(); if (!empty($buildId)) { - $build = BuildFactory::getBuild($build); + $build = BuildFactory::getBuild($this->configuration, $build); $project = $build->getProject(); $build->sendStatusPostback(); $this->addBuildToQueue( @@ -292,7 +283,7 @@ public function createDuplicateBuild(Build $originalBuild, $source) */ public function deleteOldByProject($projectId) { - $keepBuilds = (int)Config::getInstance()->get('php-censor.build.keep_builds', 100); + $keepBuilds = (int)$this->configuration->get('php-censor.build.keep_builds', 100); $builds = $this->buildStore->getOldByProject((int)$projectId, $keepBuilds); /** @var Build $build */ @@ -371,15 +362,13 @@ public function addBuildToQueue(Build $build, $buildPriority = Project::DEFAULT_ */ public function addJobToQueue($jobType, array $jobData, $queuePriority = PheanstalkInterface::DEFAULT_PRIORITY) { - $config = Config::getInstance(); - $settings = $config->get('php-censor.queue', []); - + $settings = $this->configuration->get('php-censor.queue', []); if (!empty($settings['host']) && !empty($settings['name'])) { $jobData['type'] = $jobType; try { $pheanstalk = Pheanstalk::create( $settings['host'], - $config->get('php-censor.queue.port', PheanstalkInterface::DEFAULT_PORT) + $this->configuration->get('php-censor.queue.port', PheanstalkInterface::DEFAULT_PORT) ); $pheanstalk->useTube($settings['name']); @@ -387,7 +376,7 @@ public function addJobToQueue($jobType, array $jobData, $queuePriority = Pheanst json_encode($jobData), $queuePriority, PheanstalkInterface::DEFAULT_DELAY, - $config->get('php-censor.queue.lifetime', 600) + $this->configuration->get('php-censor.queue.lifetime', 600) ); } catch (Exception $ex) { $this->queueError = true; diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index 6013ff0d7..c65838348 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -1,9 +1,11 @@ bufferSize = (int)Config::getInstance()->get('php-censor.build.writer_buffer_size', 500); + public function __construct( + ConfigurationInterface $configuration, + int $projectId, + int $buildId + ) { + $this->bufferSize = (int)$configuration->get('php-censor.build.writer_buffer_size', 500); $this->projectId = $projectId; $this->buildId = $buildId; diff --git a/src/View.php b/src/View.php index 1e0bbe067..be1d257f9 100644 --- a/src/View.php +++ b/src/View.php @@ -112,17 +112,6 @@ public function render() return $html; } - /** - * @return bool - */ - protected function loginIsDisabled() - { - $config = Config::getInstance(); - $disableAuth = (bool)$config->get('php-censor.security.disable_auth', false); - - return $disableAuth; - } - /** * @return User|null * diff --git a/src/View/Email/long.phtml b/src/View/Email/long.phtml index 8b9733d77..1f3480559 100644 --- a/src/View/Email/long.phtml +++ b/src/View/Email/long.phtml @@ -1,12 +1,15 @@

getCommitMessage()); ?> 

-    getLog()); ?>
+    convert($build->getLog());
+    ?>
diff --git a/src/View/layout.phtml b/src/View/layout.phtml index 15fdf2a31..a382c06f1 100644 --- a/src/View/layout.phtml +++ b/src/View/layout.phtml @@ -105,7 +105,7 @@ $user = $this->getUser(); - loginIsDisabled()): ?> + isLoginDisabled): ?>
  • @@ -142,7 +142,7 @@ $user = $this->getUser();
    - loginIsDisabled()): ?> + isLoginDisabled): ?>
    diff --git a/src/WebController.php b/src/WebController.php index 096639ee4..b19105aad 100644 --- a/src/WebController.php +++ b/src/WebController.php @@ -33,10 +33,10 @@ abstract class WebController extends Controller public $layout = null; /** - * @param Config $config + * @param ConfigurationInterface $config * @param Request $request */ - public function __construct(Config $config, Request $request) + public function __construct(ConfigurationInterface $config, Request $request) { parent::__construct($config, $request); @@ -55,7 +55,8 @@ public function init() $version = (string)\trim(\file_get_contents(ROOT_DIR . 'VERSION.md')); $version = !empty($version) ? $version : '0.0.0 (UNKNOWN)'; - $this->layout->version = $version; + $this->layout->version = $version; + $this->layout->isLoginDisabled = (bool)$this->configuration->get('php-censor.security.disable_auth', false); $groups = []; $groupStore = Factory::getStore('ProjectGroup'); diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index e95c69042..b1b92ae8d 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -1,19 +1,22 @@ logger = $logger; - $this->buildService = $buildService; + $this->logger = $logger; + $this->buildService = $buildService; + $this->configuration = $configuration; $this->queueTube = $queueTube; $this->pheanstalk = Pheanstalk::create($queueHost, $queuePort); @@ -134,7 +115,7 @@ protected function runWorker() ) ); - $build = BuildFactory::getBuildById($jobData['build_id']); + $build = BuildFactory::getBuildById($this->configuration, (int)$jobData['build_id']); if (!$build) { $this->logger->warning( @@ -171,7 +152,7 @@ protected function runWorker() $buildDbLog = new BuildDBLogHandler($build, Logger::DEBUG); $this->logger->pushHandler($buildDbLog); - $builder = new Builder($build, $this->logger); + $builder = new Builder($this->configuration, $build, $this->logger); try { $builder->execute(); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 15fd8b229..814d2fd3f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,33 +1,13 @@ getMockBuilder('PHPCensor\\Store\\UserStore')->getMock(); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $userStoreMock = $this->getMockBuilder('PHPCensor\\Store\\UserStore')->getMock(); - $this->command = new CreateAdminCommand($userStoreMock); + $this->command = new CreateAdminCommand($this->configuration, $this->logger, $userStoreMock); $this->helper = $this ->getMockBuilder('Symfony\\Component\\Console\\Helper\\QuestionHelper') diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index dadca3058..378ecf8f3 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -4,8 +4,10 @@ use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Command\CreateBuildCommand; +use PHPCensor\ConfigurationInterface; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; @@ -21,11 +23,17 @@ class CreateBuildCommandTest extends TestCase */ protected $application; + protected ConfigurationInterface $configuration; + + protected LoggerInterface $logger; + protected function setUp(): void { parent::setUp(); - $projectMock = $this->getMockBuilder('PHPCensor\\Model\\Project')->getMock(); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $projectMock = $this->getMockBuilder('PHPCensor\\Model\\Project')->getMock(); $projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore') ->getMock(); @@ -46,7 +54,7 @@ protected function setUp(): void [$projectMock, null, 'master', null, null, null] ); - $this->command = new CreateBuildCommand($projectStoreMock, $buildServiceMock); + $this->command = new CreateBuildCommand($this->configuration, $this->logger, $projectStoreMock, $buildServiceMock); $this->application = new Application(); } diff --git a/tests/src/ConfigurationTest.php b/tests/src/ConfigurationTest.php new file mode 100644 index 000000000..c518fc7e0 --- /dev/null +++ b/tests/src/ConfigurationTest.php @@ -0,0 +1,25 @@ +all()); + } + + public function testYamlConfig() + { + $configuration = new Configuration(dirname(__DIR__) . '/data/configuration.yml'); + + self::assertEquals(['test' => 'test'], $configuration->all()); + } +} diff --git a/tests/src/DatabaseMysqlTest.php b/tests/src/DatabaseMysqlTest.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/src/DatabasePostgresqlTest.php b/tests/src/DatabasePostgresqlTest.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/src/Helper/AnsiConverterTest.php b/tests/src/Helper/AnsiConverterTest.php index a839f7800..32e1bb71f 100644 --- a/tests/src/Helper/AnsiConverterTest.php +++ b/tests/src/Helper/AnsiConverterTest.php @@ -2,8 +2,8 @@ namespace Tests\PHPCensor\Helper; -use PHPCensor\Helper\AnsiConverter; use PHPUnit\Framework\TestCase; +use SensioLabs\AnsiConverter\AnsiToHtmlConverter; class AnsiConverterTest extends TestCase { @@ -11,7 +11,9 @@ public function testConvert_convertToHtml() { $input = "\e[31mThis is red !\e[0m"; $expectedOutput = 'This is red !'; - $actualOutput = AnsiConverter::convert($input); + + $converter = new AnsiToHtmlConverter(null, false); + $actualOutput = $converter->convert($input); self::assertEquals($expectedOutput, $actualOutput); } diff --git a/tests/src/Helper/EmailTest.php b/tests/src/Helper/EmailTest.php index a50e61bfa..72c80cc3e 100644 --- a/tests/src/Helper/EmailTest.php +++ b/tests/src/Helper/EmailTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Helper; -use PHPCensor\Config; +use PHPCensor\ConfigurationInterface; use PHPCensor\Helper\Email; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -23,7 +23,7 @@ protected function setUp(): void { parent::setUp(); - $this->config = $this->createMock(Config::class); + $this->config = $this->createMock(ConfigurationInterface::class); $this->email = new Email($this->config); } diff --git a/tests/src/Logging/AnsiFormatterTest.php b/tests/src/Logging/AnsiFormatterTest.php new file mode 100644 index 000000000..34a0f163f --- /dev/null +++ b/tests/src/Logging/AnsiFormatterTest.php @@ -0,0 +1,31 @@ +format([ + 'level_name' => \strtoupper(LogLevel::WARNING), + 'channel' => 'log', + 'context' => [], + 'message' => "\033[0;31mPart1\033[0m, \033[0;32mPart2\033[0m, \033[0;36mPart3\033[0m", + 'datetime' => new DateTimeImmutable(), + 'extra' => [], + ]); + + $this->assertEquals( + '[' . \date('Y-m-d') . '] log.WARNING: Part1, Part2, Part3 [] []'."\n", + $message + ); + } +} diff --git a/tests/src/Logging/BuildLogger2Test.php b/tests/src/Logging/BuildLogger2Test.php new file mode 100644 index 000000000..2265a3960 --- /dev/null +++ b/tests/src/Logging/BuildLogger2Test.php @@ -0,0 +1,22 @@ +createMock(LoggerInterface::class); + $build = $this->createMock(Build::class); + + $buildLogger = new BuildLogger($logger, $build); + } +} diff --git a/tests/src/Logging/OutputLogHandlerTest.php b/tests/src/Logging/OutputLogHandlerTest.php new file mode 100644 index 000000000..9e84ca248 --- /dev/null +++ b/tests/src/Logging/OutputLogHandlerTest.php @@ -0,0 +1,35 @@ +write($record); + } +} + +class OutputLogHandlerTest extends TestCase +{ + public function testWrite() + { + $output = $this->createMock(NullOutput::class); + $output + ->expects($this->once()) + ->method('write') + ->with('Formatted message'); + + $handler = new TestingOutputLogHandler($output); + + $handler->publicWrite([ + 'formatted' => 'Formatted message', + ]); + } +} diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index e60e7346f..09bbc8813 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -152,7 +152,10 @@ public function testGogsBuildLinks() $project->setType(Project::TYPE_GOGS); $project->setReference('https://gogs.repository/the-vendor/the-project.git'); + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $stub = $this->getMockBuilder(GogsBuild::class) + ->setConstructorArgs([$configuration]) ->setMethods(['getProject', 'getCommitId', 'getBranch']) ->getMock(); diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index 5c818dac7..6ed5e959b 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Plugin; -use PHPCensor\Config; +use PHPCensor\Configuration; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -59,7 +59,7 @@ protected function setUp(): void $this->mailDelivered = true; $self = $this; - new Config(); + new Configuration(''); $this->mockProject = $this ->getMockBuilder('\PHPCensor\Model\Project') diff --git a/tests/src/Plugin/Option/PhpUnitOptionsTest.php b/tests/src/Plugin/Option/PhpUnitOptionsTest.php index 11b83e09e..353dc1b80 100644 --- a/tests/src/Plugin/Option/PhpUnitOptionsTest.php +++ b/tests/src/Plugin/Option/PhpUnitOptionsTest.php @@ -3,6 +3,7 @@ namespace Tests\PHPCensor\Plugin\Option; use PHPCensor\Builder; +use PHPCensor\ConfigurationInterface; use PHPCensor\Plugin\Option\PhpUnitOptions; use PHPUnit\Framework\TestCase; @@ -97,13 +98,18 @@ public function validOptionsProvider() */ public function testCommandArguments($rawOptions, $parsedArguments) { - $options = new PhpUnitOptions($rawOptions, '/location'); + $configuration = $this->createMock(ConfigurationInterface::class); + + $options = new PhpUnitOptions($configuration, $rawOptions, '/location'); self::assertSame($parsedArguments, $options->getCommandArguments()); } public function testGetters() { + $configuration = $this->createMock(ConfigurationInterface::class); + $options = new PhpUnitOptions( + $configuration, [ 'run_from' => '/path/to/run/from', 'path' => 'subTest', diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index 85750ec49..f6aa61d6a 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -2,9 +2,7 @@ namespace Tests\PHPCensor\Plugin; -use PHPCensor\Plugin\PhpUnit; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockBuilder; /** * Unit test for the PHPUnit plugin. @@ -48,7 +46,6 @@ public function testMultiConfigFile() /** * @param array $options * - * @return PHPUnit_Framework_MockObject_MockBuilder */ protected function getPluginBuilder($options = []) { @@ -57,9 +54,20 @@ protected function getPluginBuilder($options = []) ->setMethods(['addRecord']) ->getMock(); - $mockBuild = $this->getMockBuilder('\PHPCensor\Model\Build')->getMock(); - $mockBuilder = $this->getMockBuilder('\PHPCensor\Builder') - ->setConstructorArgs([$mockBuild, $loggerMock]) + $mockConfiguration = $this->getMockBuilder('\PHPCensor\ConfigurationInterface')->getMock(); + + $mockBuild = $this->getMockBuilder('\PHPCensor\Model\Build')->getMock(); + + $mockBuild + ->method('getId') + ->willReturn(1); + + $mockBuild + ->method('getProjectId') + ->willReturn(1); + + $mockBuilder = $this->getMockBuilder('\PHPCensor\Builder') + ->setConstructorArgs([$mockConfiguration, $mockBuild, $loggerMock]) ->setMethods(['executeCommand'])->getMock(); return $this->getMockBuilder('PHPCensor\Plugin\PhpUnit')->setConstructorArgs( diff --git a/tests/src/ProcessControl/PosixProcessControlTest.php b/tests/src/ProcessControl/PosixProcessControlTest.php deleted file mode 100644 index f2333d25d..000000000 --- a/tests/src/ProcessControl/PosixProcessControlTest.php +++ /dev/null @@ -1,18 +0,0 @@ -object = new PosixProcessControl(); - } - - public function testIsAvailable() - { - self::assertEquals(function_exists('posix_kill'), PosixProcessControl::isAvailable()); - } -} diff --git a/tests/src/ProcessControl/ProcessControlTest.php b/tests/src/ProcessControl/ProcessControlTest.php deleted file mode 100644 index 30fbc2b5c..000000000 --- a/tests/src/ProcessControl/ProcessControlTest.php +++ /dev/null @@ -1,130 +0,0 @@ -pipes = []; - - $this->process = proc_open($this->getTestCommand(), $desc, $this->pipes); - sleep(1); - - self::assertTrue(is_resource($this->process)); - self::assertTrue($this->isRunning()); - - $status = proc_get_status($this->process); - return (int)$status['pid']; - } - - /** End the running process. - * - * @return int - */ - protected function endProcess() - { - if (!is_resource($this->process)) { - return; - } - array_map('fclose', $this->pipes); - $exitCode = proc_close($this->process); - self::assertFalse($this->isRunning()); - $this->process = null; - return $exitCode; - } - - /** - * @return bool - */ - protected function isRunning() - { - if (!is_resource($this->process)) { - return false; - } - $status = proc_get_status($this->process); - return (bool)$status['running']; - } - - public function testIsRunning() - { - if (!$this->object->isAvailable()) { - $this->markTestSkipped(); - } - - $pid = $this->startProcess(); - - self::assertTrue($this->object->isRunning($pid)); - - fwrite($this->pipes[0], PHP_EOL); - - $exitCode = $this->endProcess(); - - self::assertEquals(0, $exitCode); - self::assertFalse($this->object->isRunning($pid)); - } - - public function testSoftKill() - { - if (!$this->object->isAvailable()) { - $this->markTestSkipped(); - } - - $pid = $this->startProcess(); - - self::assertTrue($this->object->kill($pid)); - sleep(1); - - self::assertFalse($this->isRunning()); - } - - public function testForcefullyKill() - { - if (!$this->object->isAvailable()) { - $this->markTestSkipped(); - } - - $pid = $this->startProcess(); - - $this->object->kill($pid, true); - sleep(1); - - self::assertFalse($this->isRunning()); - } - - abstract public function testIsAvailable(); - - abstract public function getTestCommand(); - - protected function tearDown() : void - { - parent::tearDown(); - $this->endProcess(); - } -} diff --git a/tests/src/ProcessControl/UnixProcessControlTest.php b/tests/src/ProcessControl/UnixProcessControlTest.php deleted file mode 100644 index 222a95d83..000000000 --- a/tests/src/ProcessControl/UnixProcessControlTest.php +++ /dev/null @@ -1,23 +0,0 @@ -object = new UnixProcessControl(); - } - - public function getTestCommand() - { - return "read SOMETHING"; - } - - public function testIsAvailable() - { - self::assertEquals(DIRECTORY_SEPARATOR === '/', UnixProcessControl::isAvailable()); - } -} diff --git a/tests/src/Security/Authentication/ServiceTest.php b/tests/src/Security/Authentication/ServiceTest.php index bf919d075..102b2cb2f 100644 --- a/tests/src/Security/Authentication/ServiceTest.php +++ b/tests/src/Security/Authentication/ServiceTest.php @@ -2,6 +2,7 @@ namespace Tests\PHPCensor\Security\Authentication; +use PHPCensor\ConfigurationInterface; use PHPCensor\Model\User; use PHPCensor\Security\Authentication\Service; use PHPCensor\Security\Authentication\UserProvider\AbstractProvider; @@ -12,9 +13,13 @@ class ServiceTest extends TestCase { use ProphecyTrait; - public function testGetInstance() + protected ConfigurationInterface $configuration; + + protected function setUp(): void { - self::assertInstanceOf('\PHPCensor\Security\Authentication\Service', Service::getInstance()); + parent::setUp(); + + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); } public function testBuildBuiltinProvider() @@ -40,7 +45,7 @@ public function testGetProviders() $b = $this->prophesize('\PHPCensor\Security\Authentication\UserProviderInterface')->reveal(); $providers = ['a' => $a, 'b' => $b]; - $service = new Service($providers); + $service = new Service($this->configuration, $providers); self::assertEquals($providers, $service->getProviders()); } @@ -51,7 +56,7 @@ public function testGetLoginPasswordProviders() $b = $this->prophesize('\PHPCensor\Security\Authentication\LoginPasswordProviderInterface')->reveal(); $providers = ['a' => $a, 'b' => $b]; - $service = new Service($providers); + $service = new Service($this->configuration, $providers); self::assertEquals(['b' => $b], $service->getLoginPasswordProviders()); } diff --git a/tests/src/Service/BuildServiceTest.php b/tests/src/Service/BuildServiceTest.php index 42327834a..30a043c63 100644 --- a/tests/src/Service/BuildServiceTest.php +++ b/tests/src/Service/BuildServiceTest.php @@ -4,8 +4,11 @@ use DateTime; use Exception; +use PHPCensor\ConfigurationInterface; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; +use PHPCensor\Store\BuildStore; +use PHPCensor\Store\EnvironmentStore; use PHPUnit\Framework\TestCase; /** @@ -15,24 +18,17 @@ */ class BuildServiceTest extends TestCase { + protected BuildService $testedService; - /** - * @var BuildService $testedService - */ - protected $testedService; + protected BuildStore $mockBuildStore; - /** - * @var $mockBuildStore - */ - protected $mockBuildStore; + protected ConfigurationInterface $configuration; - /** - * @var $mockEnvironmentStore - */ - protected $mockEnvironmentStore; + protected EnvironmentStore $mockEnvironmentStore; protected function setUp(): void { + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); $this->mockBuildStore = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock(); $this->mockBuildStore ->expects($this->any()) @@ -47,7 +43,7 @@ protected function setUp(): void $mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); - $this->testedService = new BuildService($this->mockBuildStore, $mockProjectStore); + $this->testedService = new BuildService($this->configuration, $this->mockBuildStore, $mockProjectStore); } public function testExecute_CreateBasicBuild() @@ -189,7 +185,7 @@ public function testExecute_DeleteBuild() $mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); - $service = new BuildService($store, $mockProjectStore); + $service = new BuildService($this->configuration, $store, $mockProjectStore); $build = new Build(); self::assertEquals(true, $service->deleteBuild($build)); diff --git a/tests/src/StoreMysqlTest.php b/tests/src/StoreMysqlTest.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/src/StorePostgresqlTest.php b/tests/src/StorePostgresqlTest.php deleted file mode 100644 index e69de29bb..000000000 From a256b91fc9a288e677eb3df72d196ff22cca9198 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 19 May 2021 22:13:01 +0700 Subject: [PATCH 006/212] Refactoring: Strict types. --- src/Console/Application.php | 7 +++- src/Exception/Exception.php | 7 ---- src/Exception/HttpException.php | 39 ++++++++----------- .../HttpException/BadRequestException.php | 18 +++++---- .../HttpException/ForbiddenException.php | 18 +++++---- .../HttpException/NotAuthorizedException.php | 18 +++++---- .../HttpException/NotFoundException.php | 18 +++++---- .../HttpException/ServerErrorException.php | 8 ++++ src/Exception/InvalidArgumentException.php | 10 +++++ src/Model.php | 2 +- src/Model/Base/Build.php | 2 +- src/Model/Base/BuildError.php | 3 +- src/Model/Base/BuildMeta.php | 3 +- src/Model/Base/Environment.php | 3 +- src/Model/Base/Project.php | 2 +- src/Model/Base/ProjectGroup.php | 3 +- src/Model/Base/User.php | 3 +- 17 files changed, 88 insertions(+), 76 deletions(-) delete mode 100644 src/Exception/Exception.php diff --git a/src/Console/Application.php b/src/Console/Application.php index 1a964e977..8ec9efd6a 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -1,5 +1,7 @@ */ class Application extends BaseApplication { diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php deleted file mode 100644 index 7de397015..000000000 --- a/src/Exception/Exception.php +++ /dev/null @@ -1,7 +0,0 @@ - + */ class HttpException extends Exception { - /** - * @var int - */ - protected $errorCode = 500; - - /** - * @var string - */ - protected $statusMessage = 'Internal Server Error'; - - /** - * @return int - */ - public function getErrorCode() + protected int $errorCode = 500; + + protected string $statusMessage = 'Internal Server Error'; + + public function getErrorCode(): int { return $this->errorCode; } - /** - * @return string - */ - public function getStatusMessage() + public function getStatusMessage(): string { return $this->statusMessage; } - /** - * @return string - */ - public function getHttpHeader() + public function getHttpHeader(): string { return 'HTTP/1.1 ' . $this->errorCode . ' ' . $this->statusMessage; } diff --git a/src/Exception/HttpException/BadRequestException.php b/src/Exception/HttpException/BadRequestException.php index 27b01eee3..747a8a3fa 100644 --- a/src/Exception/HttpException/BadRequestException.php +++ b/src/Exception/HttpException/BadRequestException.php @@ -1,18 +1,20 @@ + */ class BadRequestException extends HttpException { - /** - * @var int - */ - protected $errorCode = 400; + protected int $errorCode = 400; - /** - * @var string - */ - protected $statusMessage = 'Bad Request'; + protected string $statusMessage = 'Bad Request'; } diff --git a/src/Exception/HttpException/ForbiddenException.php b/src/Exception/HttpException/ForbiddenException.php index bca61f0b7..d870fb5c4 100644 --- a/src/Exception/HttpException/ForbiddenException.php +++ b/src/Exception/HttpException/ForbiddenException.php @@ -1,18 +1,20 @@ + */ class ForbiddenException extends HttpException { - /** - * @var int - */ - protected $errorCode = 403; + protected int $errorCode = 403; - /** - * @var string - */ - protected $statusMessage = 'Forbidden'; + protected string $statusMessage = 'Forbidden'; } diff --git a/src/Exception/HttpException/NotAuthorizedException.php b/src/Exception/HttpException/NotAuthorizedException.php index 67f88f3c5..6f15fd530 100644 --- a/src/Exception/HttpException/NotAuthorizedException.php +++ b/src/Exception/HttpException/NotAuthorizedException.php @@ -1,18 +1,20 @@ + */ class NotAuthorizedException extends HttpException { - /** - * @var int - */ - protected $errorCode = 401; + protected int $errorCode = 401; - /** - * @var string - */ - protected $statusMessage = 'Not Authorized'; + protected string $statusMessage = 'Not Authorized'; } diff --git a/src/Exception/HttpException/NotFoundException.php b/src/Exception/HttpException/NotFoundException.php index 4766cffda..e8cf4fb0c 100644 --- a/src/Exception/HttpException/NotFoundException.php +++ b/src/Exception/HttpException/NotFoundException.php @@ -1,18 +1,20 @@ + */ class NotFoundException extends HttpException { - /** - * @var int - */ - protected $errorCode = 404; + protected int $errorCode = 404; - /** - * @var string - */ - protected $statusMessage = 'Not Found'; + protected string $statusMessage = 'Not Found'; } diff --git a/src/Exception/HttpException/ServerErrorException.php b/src/Exception/HttpException/ServerErrorException.php index 7568b4b7f..6cd4a26b7 100644 --- a/src/Exception/HttpException/ServerErrorException.php +++ b/src/Exception/HttpException/ServerErrorException.php @@ -1,9 +1,17 @@ + */ class ServerErrorException extends HttpException { } diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php index 17e85a0f4..09d1d2fec 100644 --- a/src/Exception/InvalidArgumentException.php +++ b/src/Exception/InvalidArgumentException.php @@ -1,7 +1,17 @@ + */ class InvalidArgumentException extends Exception { } diff --git a/src/Model.php b/src/Model.php index e16e993e3..e362f8b66 100644 --- a/src/Model.php +++ b/src/Model.php @@ -1,6 +1,6 @@ Date: Wed, 19 May 2021 22:13:28 +0700 Subject: [PATCH 007/212] Refactoring: Improved database management. --- bin/console | 4 +- bootstrap.php | 8 +- public/index.php | 2 + src/Application.php | 48 ++-- src/Builder.php | 31 +-- src/Command/Command.php | 9 +- src/Command/CreateAdminCommand.php | 7 +- src/Command/CreateBuildCommand.php | 4 +- src/Command/RemoveOldBuildsCommand.php | 4 +- src/Command/WorkerCommand.php | 5 +- src/Console/Application.php | 16 +- src/Database.php | 217 ------------------- src/DatabaseManager.php | 4 +- src/Plugin/BitbucketNotify.php | 8 - src/Plugin/Mysql.php | 1 - src/Store.php | 28 ++- src/Store/BuildErrorStore.php | 16 +- src/Store/BuildErrorWriter.php | 9 +- src/Store/BuildMetaStore.php | 9 +- src/Store/BuildStore.php | 35 ++- src/Store/EnvironmentStore.php | 7 +- src/Store/Factory.php | 13 +- src/Store/ProjectGroupStore.php | 5 +- src/Store/ProjectStore.php | 13 +- src/Store/UserStore.php | 11 +- src/Worker/BuildWorker.php | 18 +- tests/src/Command/CreateAdminCommandTest.php | 20 +- tests/src/Command/CreateBuildCommandTest.php | 21 +- tests/src/Plugin/PhpUnitTest.php | 17 +- tests/src/Service/BuildServiceTest.php | 34 ++- tests/src/Service/ProjectServiceTest.php | 19 +- tests/src/Service/UserServiceTest.php | 24 +- 32 files changed, 268 insertions(+), 399 deletions(-) delete mode 100644 src/Database.php diff --git a/bin/console b/bin/console index 32cf66b17..3e8d1c029 100755 --- a/bin/console +++ b/bin/console @@ -3,11 +3,13 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\Console\Application; +use PHPCensor\DatabaseManager; error_reporting(-1); ini_set('display_errors', 1); /** @var $configuration ConfigurationInterface */ +/** @var $databaseManager DatabaseManager */ require_once(dirname(__DIR__) . '/bootstrap.php'); -(new Application($configuration))->run(); +(new Application($configuration, $databaseManager))->run(); diff --git a/bootstrap.php b/bootstrap.php index 7480aa55a..2d4509bcc 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -1,8 +1,9 @@ get('php-censor.url', '') . '/'); diff --git a/public/index.php b/public/index.php index e7a5d4410..45c9c0d39 100644 --- a/public/index.php +++ b/public/index.php @@ -1,10 +1,12 @@ config = $config; + private Router $router; + + public function __construct( + ConfigurationInterface $configuration, + DatabaseManager $databaseManager, + ?Request $request = null + ) { + $this->configuration = $configuration; + $this->databaseManager = $databaseManager; $this->request = new Request(); if (!is_null($request)) { @@ -178,7 +164,7 @@ public function handleRequest() protected function loadController($class) { /** @var Controller $controller */ - $controller = new $class($this->config, $this->request); + $controller = new $class($this->configuration, $this->request); $controller->init(); @@ -192,8 +178,8 @@ protected function loadController($class) */ protected function shouldSkipAuth(): bool { - $disableAuth = (bool)$this->config->get('php-censor.security.disable_auth', false); - $defaultUserId = (int)$this->config->get('php-censor.security.default_user_id', 1); + $disableAuth = (bool)$this->configuration->get('php-censor.security.disable_auth', false); + $defaultUserId = (int)$this->configuration->get('php-censor.security.default_user_id', 1); if ($disableAuth && $defaultUserId) { $user = Factory::getStore('User')->getByPrimaryKey($defaultUserId); diff --git a/src/Builder.php b/src/Builder.php index c4a139ef2..f939e4daa 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -71,11 +71,6 @@ class Builder */ protected $config = []; - /** - * @var string - */ - protected $lastOutput; - /** * @var BuildInterpolator */ @@ -108,16 +103,17 @@ class Builder private ConfigurationInterface $configuration; - /** - * Set up the builder. - * - * @param ConfigurationInterface $configuration - * @param Build $build - * @param LoggerInterface $logger - */ - public function __construct(ConfigurationInterface $configuration, Build $build, LoggerInterface $logger = null) - { + private DatabaseManager $databaseManager; + + public function __construct( + ConfigurationInterface $configuration, + DatabaseManager $databaseManager, + Build $build, + LoggerInterface $logger = null + ) { $this->configuration = $configuration; + $this->databaseManager = $databaseManager; + $this->build = $build; $this->store = Factory::getStore('Build'); @@ -133,7 +129,12 @@ public function __construct(ConfigurationInterface $configuration, Build $build, ); $this->interpolator = new BuildInterpolator(); - $this->buildErrorWriter = new BuildErrorWriter($this->configuration, $this->build->getProjectId(), $this->build->getId()); + $this->buildErrorWriter = new BuildErrorWriter( + $this->configuration, + $this->databaseManager, + $this->build->getProjectId(), + $this->build->getId() + ); } public function getBuildLogger(): BuildLogger diff --git a/src/Command/Command.php b/src/Command/Command.php index 78e44ff5b..1e99f8a80 100644 --- a/src/Command/Command.php +++ b/src/Command/Command.php @@ -7,6 +7,7 @@ use Monolog\Handler\AbstractHandler; use Monolog\Logger; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Logging\OutputLogHandler; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -24,17 +25,21 @@ abstract class Command extends BaseCommand { protected ConfigurationInterface $configuration; + protected DatabaseManager $databaseManager; + protected LoggerInterface $logger; public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, ?string $name = null ) { parent::__construct($name); - $this->configuration = $configuration; - $this->logger = $logger; + $this->configuration = $configuration; + $this->databaseManager = $databaseManager; + $this->logger = $logger; } protected function configureLogging(OutputInterface $output) diff --git a/src/Command/CreateAdminCommand.php b/src/Command/CreateAdminCommand.php index 132605bea..14f2b2a40 100644 --- a/src/Command/CreateAdminCommand.php +++ b/src/Command/CreateAdminCommand.php @@ -6,15 +6,13 @@ use PHPCensor\Command\Action\CreateAdmin; use PHPCensor\ConfigurationInterface; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Service\UserService; +use PHPCensor\DatabaseManager; use PHPCensor\Store\UserStore; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Question\Question; /** * @package PHP Censor @@ -29,11 +27,12 @@ class CreateAdminCommand extends Command public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, UserStore $userStore, ?string $name = null ) { - parent::__construct($configuration, $logger, $name); + parent::__construct($configuration, $databaseManager, $logger, $name); $this->userStore = $userStore; } diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index c39266ccc..62903a350 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -5,6 +5,7 @@ namespace PHPCensor\Command; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; @@ -32,12 +33,13 @@ class CreateBuildCommand extends Command public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, ProjectStore $projectStore, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $logger, $name); + parent::__construct($configuration, $databaseManager, $logger, $name); $this->projectStore = $projectStore; $this->buildService = $buildService; diff --git a/src/Command/RemoveOldBuildsCommand.php b/src/Command/RemoveOldBuildsCommand.php index 6f5150809..cbf4d337a 100644 --- a/src/Command/RemoveOldBuildsCommand.php +++ b/src/Command/RemoveOldBuildsCommand.php @@ -5,6 +5,7 @@ namespace PHPCensor\Command; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Service\BuildService; use PHPCensor\Store\ProjectStore; use Psr\Log\LoggerInterface; @@ -27,12 +28,13 @@ class RemoveOldBuildsCommand extends Command public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, ProjectStore $projectStore, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $logger, $name); + parent::__construct($configuration, $databaseManager, $logger, $name); $this->projectStore = $projectStore; $this->buildService = $buildService; diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 4bbf4be4b..35f45a898 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -7,6 +7,7 @@ use Exception; use Pheanstalk\Pheanstalk; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Service\BuildService; use PHPCensor\Worker\BuildWorker; use Psr\Log\LoggerInterface; @@ -32,11 +33,12 @@ class WorkerCommand extends Command public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $logger, $name); + parent::__construct($configuration, $databaseManager, $logger, $name); $this->buildService = $buildService; } @@ -98,6 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output) (new BuildWorker( $this->configuration, + $this->databaseManager, $this->logger, $this->buildService, $config['host'], diff --git a/src/Console/Application.php b/src/Console/Application.php index 8ec9efd6a..e1f85f2b6 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -22,6 +22,7 @@ use PHPCensor\Command\RebuildQueueCommand; use PHPCensor\Command\WorkerCommand; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Logging\AnsiFormatter; use PHPCensor\Logging\Handler; use PHPCensor\Service\BuildService; @@ -86,6 +87,7 @@ protected function initLogger(ConfigurationInterface $applicationConfig): Logger */ public function __construct( ConfigurationInterface $applicationConfig, + DatabaseManager $databaseManager, string $name = 'PHP Censor', string $version = 'UNKNOWN' ) { @@ -178,13 +180,13 @@ public function __construct( $buildService = new BuildService($applicationConfig, $buildStore, $projectStore); $logger = $this->initLogger($applicationConfig); - $this->add(new InstallCommand($applicationConfig, $logger)); - $this->add(new CreateAdminCommand($applicationConfig, $logger, $userStore)); - $this->add(new CreateBuildCommand($applicationConfig, $logger, $projectStore, $buildService)); - $this->add(new RemoveOldBuildsCommand($applicationConfig, $logger, $projectStore, $buildService)); - $this->add(new WorkerCommand($applicationConfig, $logger, $buildService)); - $this->add(new RebuildQueueCommand($applicationConfig, $logger)); - $this->add(new CheckLocalizationCommand($applicationConfig, $logger)); + $this->add(new InstallCommand($applicationConfig, $databaseManager, $logger)); + $this->add(new CreateAdminCommand($applicationConfig, $databaseManager, $logger, $userStore)); + $this->add(new CreateBuildCommand($applicationConfig, $databaseManager, $logger, $projectStore, $buildService)); + $this->add(new RemoveOldBuildsCommand($applicationConfig, $databaseManager, $logger, $projectStore, $buildService)); + $this->add(new WorkerCommand($applicationConfig, $databaseManager, $logger, $buildService)); + $this->add(new RebuildQueueCommand($applicationConfig, $databaseManager, $logger)); + $this->add(new CheckLocalizationCommand($applicationConfig, $databaseManager, $logger)); } public function getHelp(): string diff --git a/src/Database.php b/src/Database.php deleted file mode 100644 index bc5da78d2..000000000 --- a/src/Database.php +++ /dev/null @@ -1,217 +0,0 @@ - [], - 'write' => [] - ]; - - /** - * @var array - */ - protected static $connections = [ - 'read' => null, - 'write' => null - ]; - - /** - * @var array - */ - protected static $dsn = [ - 'read' => '', - 'write' => '' - ]; - - protected static $details = []; - - /** - * @param string $table - * - * @return string - */ - public function lastInsertIdExtended($table = null) - { - if ($table && self::POSTGRESQL_TYPE === $this->getAttribute(self::ATTR_DRIVER_NAME)) { - return parent::lastInsertId('"' . $table . '_id_seq"'); - } - - return parent::lastInsertId(); - } - - protected static function init() - { - $settings = self::$configuration->get('php-censor.database', []); - - self::$servers['read'] = $settings['servers']['read']; - self::$servers['write'] = $settings['servers']['write']; - - self::$details['driver'] = $settings['type']; - self::$details['db'] = $settings['name']; - self::$details['user'] = $settings['username']; - self::$details['pass'] = $settings['password']; - - self::$initialised = true; - } - - /** - * @param string $type - * - * @return Database - * - * @throws Exception - */ - public static function getConnection($type = 'read') - { - if (!self::$initialised) { - self::init(); - } - - if (is_null(self::$connections[$type])) { - // Shuffle, so we pick a random server: - $servers = self::$servers[$type]; - shuffle($servers); - - $connection = null; - - // Loop until we get a working connection: - while (count($servers)) { - // Pull the next server: - $server = array_shift($servers); - - self::$dsn[$type] = self::$details['driver'] . ':host=' . $server['host']; - - if (self::$details['driver'] === 'pgsql') { - if (!array_key_exists('pgsql-sslmode', $server)) { - $server['pgsql-sslmode'] = 'prefer'; - } - - self::$dsn[$type] .= ';sslmode=' . $server['pgsql-sslmode']; - } - - if (isset($server['port'])) { - self::$dsn[$type] .= ';port=' . (int)$server['port']; - } - - self::$dsn[$type] .= ';dbname=' . self::$details['db']; - - $pdoOptions = [ - PDO::ATTR_PERSISTENT => false, - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_TIMEOUT => 2, - ]; - - if (self::MYSQL_TYPE === self::$details['driver']) { - $pdoOptions[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'"; - } - - // Try to connect: - try { - $connection = new self( - self::$dsn[$type], - self::$details['user'], - self::$details['pass'], - $pdoOptions - ); - $connection->setType($type); - } catch (PDOException $ex) { - $connection = false; - } - - // Opened a connection? Break the loop: - if ($connection) { - break; - } - } - - // No connection? Oh dear. - if (!$connection && $type === 'read') { - throw new Exception('Could not connect to any ' . $type . ' servers.'); - } - - self::$connections[$type] = $connection; - } - - return self::$connections[$type]; - } - - /** - * @return array - */ - public function getDetails() - { - return self::$details; - } - - /** - * @return string - */ - public function getDsn() - { - return self::$dsn[$this->type]; - } - - /** - * @param string $type - */ - public function setType($type) - { - $this->type = $type; - } - - public static function reset() - { - self::$connections = ['read' => null, 'write' => null]; - self::$initialised = false; - } - - /** - * @param string $statement - * - * @return string - */ - protected function quoteNames($statement) - { - $quote = ''; - if (self::MYSQL_TYPE === self::$details['driver']) { - $quote = '`'; - } elseif (self::POSTGRESQL_TYPE === self::$details['driver']) { - $quote = '"'; - } - - return preg_replace('/{{(.*?)}}/', ($quote . '\1' . $quote), $statement); - } - - /** - * @param string $statement - * @param array $driverOptions - * - * @return PDOStatement - */ - public function prepareCommon($statement, array $driverOptions = []) - { - return parent::prepare($this->quoteNames($statement), $driverOptions); - } -} diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index ef7317451..3b0f84243 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -26,11 +26,11 @@ public function __construct(ConfigurationInterface $configuration) /** * @param string $type * - * @return \PDO + * @return DatabaseConnection * * @throws Exception */ - public function getConnection(string $type = 'read'): \PDO + public function getConnection(string $type = 'read'): DatabaseConnection { if (null === $this->connections[$type]) { $servers = (array)$this->configuration->get("php-censor.database.servers.{$type}", []); diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index 647c11553..89ab0866d 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -5,7 +5,6 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Database; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Util\BitbucketNotifyPluginResult; @@ -45,11 +44,6 @@ class BitbucketNotify extends Plugin */ protected $httpClient; - /** - * @var Database - */ - protected $pdo; - /** * @return string */ @@ -66,8 +60,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->pdo = Database::getConnection('read'); - $this->httpClient = new Client(); $this->url = \trim($options['url']); $this->message = isset($options['message']) ? $options['message'] : ''; diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 6d3a42e8d..6d26dbb37 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -5,7 +5,6 @@ use Exception; use PDO; use PHPCensor\Builder; -use PHPCensor\Database; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Store.php b/src/Store.php index 8b55b65a3..99d10abe3 100644 --- a/src/Store.php +++ b/src/Store.php @@ -24,22 +24,20 @@ abstract class Store */ protected $primaryKey = null; - /** - * @param string $key - * @param string $useConnection - * - * @return Model|null - */ + protected DatabaseManager $databaseManager; + abstract public function getByPrimaryKey($key, $useConnection = 'read'); /** * @throws RuntimeException */ - public function __construct() + public function __construct(DatabaseManager $databaseManager) { if (empty($this->primaryKey)) { throw new RuntimeException('Save not implemented for this store.'); } + + $this->databaseManager = $databaseManager; } /** @@ -96,12 +94,12 @@ public function getWhere( $query .= ' OFFSET ' . $offset; } - $stmt = Database::getConnection('read')->prepareCommon($countQuery); + $stmt = $this->databaseManager->getConnection('read')->prepare($countQuery); $stmt->execute($params); $res = $stmt->fetch(PDO::FETCH_ASSOC); $count = (int)$res['count']; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->execute($params); $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $rtn = []; @@ -166,7 +164,7 @@ public function saveByUpdate(Model $obj, $saveAllColumns = false) implode(', ', $updates), $this->primaryKey ); - $q = Database::getConnection('write')->prepareCommon($qs); + $q = $this->databaseManager->getConnection('write')->prepare($qs); foreach ($updateParams as $updateParam) { $q->bindValue(':' . $updateParam[0], $updateParam[1]); @@ -213,10 +211,10 @@ public function saveByInsert(Model $obj, $saveAllColumns = false) implode(', ', $cols), implode(', ', $values) ); - $q = Database::getConnection('write')->prepareCommon($qs); + $q = $this->databaseManager->getConnection('write')->prepare($qs); if ($q->execute($qParams)) { - $id = Database::getConnection('write')->lastInsertIdExtended($this->tableName); + $id = $this->databaseManager->getConnection('write')->lastInsertId($this->tableName); $rtn = $this->getByPrimaryKey($id, 'write'); } } @@ -239,9 +237,9 @@ public function delete(Model $obj) $data = $obj->getDataArray(); - $q = Database::getConnection('write') - ->prepareCommon( - sprintf( + $q = $this->databaseManager->getConnection('write') + ->prepare( + \sprintf( 'DELETE FROM {{%s}} WHERE {{%s}} = :primaryKey', $this->tableName, $this->primaryKey diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 122388bd2..8a51704fa 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -4,7 +4,6 @@ use Exception; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\BuildError; use PHPCensor\Store; @@ -56,7 +55,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -109,7 +108,7 @@ public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = nul if ($offset) { $query .= ' OFFSET :offset'; } - $stmt = Database::getConnection()->prepareCommon($query); + $stmt = $this->databaseManager->getConnection()->prepare($query); $stmt->bindValue(':build_id', $buildId); if ($plugin) { $stmt->bindValue(':plugin', $plugin, PDO::PARAM_STR); @@ -170,7 +169,7 @@ public function getErrorTotalForBuild($buildId, $plugin = null, $severity = null $query .= ' AND {{is_new}} = false'; } - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build', $buildId, PDO::PARAM_INT); @@ -212,7 +211,7 @@ public function getKnownPlugins($buildId, $severity = null, $isNew = '') $query .= ' AND {{is_new}} = false'; } - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build', $buildId); if (null !== $severity) { $stmt->bindValue(':severity', (int)$severity, PDO::PARAM_INT); @@ -253,7 +252,7 @@ public function getKnownSeverities($buildId, $plugin = '', $isNew = '') $query .= ' AND {{is_new}} = false'; } - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build', $buildId); if ($plugin) { $stmt->bindValue(':plugin', $plugin); @@ -289,7 +288,8 @@ public function getIsNewError($projectId, $hash) LEFT JOIN {{builds}} AS b ON be.build_id = b.id WHERE be.hash = :hash AND b.project_id = :project'; - $stmt = Database::getConnection('read')->prepareCommon($query); + + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':project', $projectId); $stmt->bindValue(':hash', $hash); @@ -317,7 +317,7 @@ public function getErrorAmountPerPluginForBuild($buildId) GROUP BY {{plugin}} '; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build', $buildId); $stmt->execute(); diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index c65838348..812787ee4 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -6,7 +6,7 @@ use DateTime; use PHPCensor\ConfigurationInterface; -use PHPCensor\Database; +use PHPCensor\DatabaseManager; use PHPCensor\Model\BuildError; /** @@ -29,6 +29,8 @@ class BuildErrorWriter */ private array $errors = []; + private DatabaseManager $databaseManager; + /** * @see https://stackoverflow.com/questions/40361164/pdoexception-sqlstatehy000-general-error-7-number-of-parameters-must-be-bet */ @@ -36,6 +38,7 @@ class BuildErrorWriter public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, int $projectId, int $buildId ) { @@ -43,6 +46,8 @@ public function __construct( $this->projectId = $projectId; $this->buildId = $buildId; + + $this->databaseManager = $databaseManager; } /** @@ -148,7 +153,7 @@ public function flush() ) VALUES ' . join(', ', $insertValuesPlaceholders) . ' '; - $stmt = Database::getConnection('write')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('write')->prepare($query); $stmt->execute($insertValuesData); $this->errors = []; diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index cdc9096c8..ca37a2045 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -3,7 +3,6 @@ namespace PHPCensor\Store; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\BuildMeta; use PHPCensor\Store; @@ -55,7 +54,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -86,7 +85,7 @@ public function getByKey($buildId, $key) } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{build_id}} = :build_id AND {{meta_key}} = :meta_key LIMIT 1'; - $stmt = Database::getConnection()->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build_id', $buildId); $stmt->bindValue(':meta_key', $key); @@ -117,7 +116,7 @@ public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{build_id}} = :build_id LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':build_id', $buildId); $stmt->bindValue(':limit', (int)$limit, PDO::PARAM_INT); @@ -150,7 +149,7 @@ public function getErrorsForUpgrade($limit) WHERE {{meta_key}} IN (\'phpmd-data\', \'phpcs-data\', \'phpdoccheck-data\', \'technical_debt-data\') ORDER BY {{id}} ASC LIMIT :limit'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':limit', $limit, PDO::PARAM_INT); diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 96c293b52..b0efb9a41 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -4,7 +4,6 @@ use Exception; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildMeta; @@ -60,7 +59,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -90,7 +89,7 @@ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':limit', (int)$limit, PDO::PARAM_INT); @@ -128,7 +127,7 @@ public function getByStatus($status, $limit = 1000, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{status}} = :status ORDER BY {{create_date}} ASC LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':status', $status); $stmt->bindValue(':limit', (int)$limit, PDO::PARAM_INT); @@ -157,7 +156,7 @@ public function getByStatus($status, $limit = 1000, $useConnection = 'read') public function getBuilds($limit = 5, $offset = 0) { $query = 'SELECT * FROM {{' . $this->tableName . '}} ORDER BY {{id}} DESC LIMIT :limit OFFSET :offset'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':limit', $limit, PDO::PARAM_INT); $stmt->bindValue(':offset', $offset, PDO::PARAM_INT); @@ -187,7 +186,7 @@ public function getBuilds($limit = 5, $offset = 0) public function getLatestBuildByProjectAndBranch($projectId, $branch) { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id AND {{branch}} = :branch ORDER BY {{id}} DESC'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':branch', $branch); @@ -217,7 +216,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) $query = 'SELECT * FROM {{' . $this->tableName . '}} ORDER BY {{id}} DESC LIMIT :limit'; } - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); if (!is_null($projectId)) { $stmt->bindValue(':pid', $projectId); @@ -250,7 +249,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_SUCCESS) { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :pid AND {{status}} = :status ORDER BY {{id}} DESC LIMIT 1'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':pid', $projectId); $stmt->bindValue(':status', $status); @@ -294,7 +293,7 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) LIMIT 10000 '; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -364,7 +363,7 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) public function getByProjectAndCommit($projectId, $commitId) { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id AND {{commit_id}} = :commit_id'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':commit_id', $commitId); @@ -396,7 +395,7 @@ public function getByProjectAndCommit($projectId, $commitId) public function getBuildBranches($projectId) { $query = 'SELECT DISTINCT {{branch}} FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':project_id', $projectId); if ($stmt->execute()) { @@ -440,7 +439,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR $query .= ' ORDER BY bm.id DESC LIMIT :numResults'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':key', $key, PDO::PARAM_STR); $stmt->bindValue(':projectId', (int)$projectId, PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, PDO::PARAM_INT); @@ -507,8 +506,8 @@ public function setMeta($buildId, $key, $value) public function deleteAllByProject($projectId) { - $q = Database::getConnection('write') - ->prepareCommon( + $q = $this->databaseManager->getConnection('write') + ->prepare( 'DELETE FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id' ); $q->bindValue(':project_id', $projectId); @@ -532,7 +531,7 @@ public function getOldByProject($projectId, $keep = 100) } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id ORDER BY {{create_date}} DESC LIMIT 1000000 OFFSET :keep'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':keep', (int)$keep, PDO::PARAM_INT); @@ -563,7 +562,7 @@ public function getNewErrorsCount($buildId) { $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_errors}} WHERE {{build_id}} = :build_id AND {{is_new}} = true'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build_id', $buildId); @@ -587,7 +586,7 @@ public function getErrorsCount($buildId) { $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_errors}} WHERE {{build_id}} = :build_id'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build_id', $buildId); @@ -620,7 +619,7 @@ public function getBuildErrorsTrend($buildId, $projectId, $branch) order BY b.id DESC LIMIT 2'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':build_id', $buildId, PDO::PARAM_INT); $stmt->bindValue(':project_id', $projectId, PDO::PARAM_INT); diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 49b43ed77..4f0b80cd3 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -4,7 +4,6 @@ use Exception; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\Environment; use PHPCensor\Store; @@ -56,7 +55,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -86,7 +85,7 @@ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read' } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{name}} = :name AND {{project_id}} = :project_id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':name', $name); $stmt->bindValue(':project_id', $projectId); @@ -116,7 +115,7 @@ public function getByProjectId($projectId, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $projectId); diff --git a/src/Store/Factory.php b/src/Store/Factory.php index 3c5161092..8b595897d 100644 --- a/src/Store/Factory.php +++ b/src/Store/Factory.php @@ -2,6 +2,7 @@ namespace PHPCensor\Store; +use PHPCensor\DatabaseManager; use PHPCensor\Store; class Factory @@ -9,14 +10,16 @@ class Factory /** * @var Factory */ - protected static $instance; + private static $instance; + + public static DatabaseManager $databaseManager; /** * A collection of the stores currently loaded by the factory. * * @var Store[] */ - protected $loadedStores = []; + private array $loadedStores = []; /** * @return Factory @@ -41,10 +44,6 @@ public static function getStore($storeName) return $factory->loadStore($storeName); } - protected function __construct() - { - } - /** * @param string $store * @@ -54,7 +53,7 @@ public function loadStore($store) { if (!isset($this->loadedStores[$store])) { $class = 'PHPCensor\\Store\\' . $store . 'Store'; - $obj = new $class(); + $obj = new $class(self::$databaseManager); $this->loadedStores[$store] = $obj; } diff --git a/src/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php index 67f4b244c..36f36343a 100644 --- a/src/Store/ProjectGroupStore.php +++ b/src/Store/ProjectGroupStore.php @@ -3,7 +3,6 @@ namespace PHPCensor\Store; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\ProjectGroup; use PHPCensor\Store; @@ -55,7 +54,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); @@ -85,7 +84,7 @@ public function getByTitle($title, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{title}} = :title LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $title); diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 993b367ba..75d5e1184 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -4,7 +4,6 @@ use Exception; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\Project; use PHPCensor\Store; @@ -59,7 +58,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -88,7 +87,7 @@ public function getByIds($values, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} IN ('.implode(', ', array_map('intval', $values)).')'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $rtn = []; if ($stmt->execute()) { @@ -119,7 +118,7 @@ public function getByTitle($title, $limit = 1000, $useConnection = 'read') $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{title}} = :title LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $title); $stmt->bindValue(':limit', (int)$limit, PDO::PARAM_INT); @@ -149,7 +148,7 @@ public function getByTitle($title, $limit = 1000, $useConnection = 'read') public function getKnownBranches($projectId) { $query = 'SELECT {{branch}}, COUNT(1) AS {{count}} from {{builds}} WHERE {{project_id}} = :pid GROUP BY {{branch}} ORDER BY {{count}} DESC'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':pid', $projectId); if ($stmt->execute()) { @@ -178,7 +177,7 @@ public function getAll($archived = false) $archived = (int)$archived; $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{archived}} = :archived ORDER BY {{title}} ASC'; - $stmt = Database::getConnection('read')->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':archived', $archived); @@ -219,7 +218,7 @@ public function getByGroupId($groupId, $archived = false, $limit = 1000, $useCon $archived = (int)$archived; $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{group_id}} = :group_id AND {{archived}} = :archived ORDER BY {{title}} LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':group_id', $groupId); $stmt->bindValue(':archived', $archived); diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index 6f727e39d..c1bdd1493 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -3,7 +3,6 @@ namespace PHPCensor\Store; use PDO; -use PHPCensor\Database; use PHPCensor\Exception\HttpException; use PHPCensor\Model\User; use PHPCensor\Store; @@ -58,7 +57,7 @@ public function getById($id, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $id); if ($stmt->execute()) { @@ -86,7 +85,7 @@ public function getByEmail($email) } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{email}} = :email LIMIT 1'; - $stmt = Database::getConnection()->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':email', $email); @@ -115,7 +114,7 @@ public function getByEmailOrName($emailOrName) } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{email}} = :value OR {{name}} = :value LIMIT 1'; - $stmt = Database::getConnection()->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':value', $emailOrName); if ($stmt->execute()) { @@ -143,7 +142,7 @@ public function getByRememberKey($rememberKey) } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{remember_key}} = :remember_key LIMIT 1'; - $stmt = Database::getConnection()->prepareCommon($query); + $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':remember_key', $rememberKey); if ($stmt->execute()) { @@ -173,7 +172,7 @@ public function getByName($name, $limit = 1000, $useConnection = 'read') } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{name}} = :name LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepareCommon($query); + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':name', $name); $stmt->bindValue(':limit', (int)$limit, PDO::PARAM_INT); diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index b1b92ae8d..6e0a4a99a 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -12,6 +12,7 @@ use PHPCensor\Builder; use PHPCensor\BuildFactory; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Logging\BuildDBLogHandler; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; @@ -39,6 +40,8 @@ class BuildWorker private ConfigurationInterface $configuration; + private DatabaseManager $databaseManager; + /** * beanstalkd queue to watch */ @@ -50,6 +53,7 @@ class BuildWorker public function __construct( ConfigurationInterface $configuration, + DatabaseManager $databaseManager, LoggerInterface $logger, BuildService $buildService, string $queueHost, @@ -57,9 +61,10 @@ public function __construct( string $queueTube, bool $canPeriodicalWork ) { - $this->logger = $logger; - $this->buildService = $buildService; - $this->configuration = $configuration; + $this->logger = $logger; + $this->buildService = $buildService; + $this->configuration = $configuration; + $this->databaseManager = $databaseManager; $this->queueTube = $queueTube; $this->pheanstalk = Pheanstalk::create($queueHost, $queuePort); @@ -152,7 +157,12 @@ protected function runWorker() $buildDbLog = new BuildDBLogHandler($build, Logger::DEBUG); $this->logger->pushHandler($buildDbLog); - $builder = new Builder($this->configuration, $build, $this->logger); + $builder = new Builder( + $this->configuration, + $this->databaseManager, + $build, + $this->logger + ); try { $builder->execute(); diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index d1c88d698..d8c0f7809 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -4,6 +4,7 @@ use PHPCensor\Command\CreateAdminCommand; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -30,20 +31,29 @@ class CreateAdminCommandTest extends TestCase protected ConfigurationInterface $configuration; + protected DatabaseManager $databaseManager; + protected LoggerInterface $logger; protected function setUp(): void { parent::setUp(); - $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); - $userStoreMock = $this->getMockBuilder('PHPCensor\\Store\\UserStore')->getMock(); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $userStoreMock = $this + ->getMockBuilder('PHPCensor\Store\UserStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); - $this->command = new CreateAdminCommand($this->configuration, $this->logger, $userStoreMock); + $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $this->logger, $userStoreMock); $this->helper = $this - ->getMockBuilder('Symfony\\Component\\Console\\Helper\\QuestionHelper') + ->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper') ->setMethods(['ask']) ->getMock(); diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 378ecf8f3..d48832376 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -5,6 +5,7 @@ use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Command\CreateBuildCommand; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -25,17 +26,25 @@ class CreateBuildCommandTest extends TestCase protected ConfigurationInterface $configuration; + protected DatabaseManager $databaseManager; + protected LoggerInterface $logger; protected function setUp(): void { parent::setUp(); - $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); - $projectMock = $this->getMockBuilder('PHPCensor\\Model\\Project')->getMock(); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $projectMock = $this->getMockBuilder('PHPCensor\Model\Project')->getMock(); - $projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore') + $projectStoreMock = $this + ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->setConstructorArgs([$this->databaseManager]) ->getMock(); $projectStoreMock->method('getById') ->will($this->returnValueMap([ @@ -43,7 +52,7 @@ protected function setUp(): void [2, 'read', null], ])); - $buildServiceMock = $this->getMockBuilder('PHPCensor\\Service\\BuildService') + $buildServiceMock = $this->getMockBuilder('PHPCensor\Service\BuildService') ->disableOriginalConstructor() ->getMock(); @@ -54,7 +63,7 @@ protected function setUp(): void [$projectMock, null, 'master', null, null, null] ); - $this->command = new CreateBuildCommand($this->configuration, $this->logger, $projectStoreMock, $buildServiceMock); + $this->command = new CreateBuildCommand($this->configuration, $this->databaseManager, $this->logger, $projectStoreMock, $buildServiceMock); $this->application = new Application(); } diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index f6aa61d6a..9c55e1516 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -2,6 +2,7 @@ namespace Tests\PHPCensor\Plugin; +use PHPCensor\Store\Factory; use PHPUnit\Framework\TestCase; /** @@ -17,7 +18,11 @@ public function testSingleConfigFile() 'config' => ROOT_DIR . 'phpunit.xml.dist' ]; - $mockPlugin = $this->getPluginBuilder($options)->setMethods(['runConfig'])->getMock(); + $mockPlugin = $this + ->getPluginBuilder($options) + ->setMethods(['runConfig']) + ->getMock(); + $mockPlugin->expects($this->once())->method('runConfig')->with(null, ROOT_DIR . 'phpunit.xml.dist'); $mockPlugin->execute(); @@ -54,7 +59,13 @@ protected function getPluginBuilder($options = []) ->setMethods(['addRecord']) ->getMock(); - $mockConfiguration = $this->getMockBuilder('\PHPCensor\ConfigurationInterface')->getMock(); + $mockConfiguration = $this->getMockBuilder('\PHPCensor\ConfigurationInterface')->getMock(); + $mockDatabaseManager = $this + ->getMockBuilder('\PHPCensor\DatabaseManager') + ->setConstructorArgs([$mockConfiguration]) + ->getMock(); + + Factory::$databaseManager = $mockDatabaseManager; $mockBuild = $this->getMockBuilder('\PHPCensor\Model\Build')->getMock(); @@ -67,7 +78,7 @@ protected function getPluginBuilder($options = []) ->willReturn(1); $mockBuilder = $this->getMockBuilder('\PHPCensor\Builder') - ->setConstructorArgs([$mockConfiguration, $mockBuild, $loggerMock]) + ->setConstructorArgs([$mockConfiguration, $mockDatabaseManager, $mockBuild, $loggerMock]) ->setMethods(['executeCommand'])->getMock(); return $this->getMockBuilder('PHPCensor\Plugin\PhpUnit')->setConstructorArgs( diff --git a/tests/src/Service/BuildServiceTest.php b/tests/src/Service/BuildServiceTest.php index 30a043c63..8e8728182 100644 --- a/tests/src/Service/BuildServiceTest.php +++ b/tests/src/Service/BuildServiceTest.php @@ -5,6 +5,7 @@ use DateTime; use Exception; use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; @@ -24,24 +25,39 @@ class BuildServiceTest extends TestCase protected ConfigurationInterface $configuration; + protected DatabaseManager $databaseManager; + protected EnvironmentStore $mockEnvironmentStore; protected function setUp(): void { - $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); - $this->mockBuildStore = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock(); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + $this->mockBuildStore = $this + ->getMockBuilder('PHPCensor\Store\BuildStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->mockBuildStore ->expects($this->any()) ->method('save') ->will($this->returnArgument(0)); - $this->mockEnvironmentStore = $this->getMockBuilder('PHPCensor\Store\EnvironmentStore')->getMock(); + $this->mockEnvironmentStore = $this + ->getMockBuilder('PHPCensor\Store\EnvironmentStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->mockEnvironmentStore ->expects($this->any()) ->method('getByProjectId') ->will($this->returnValue(['items' => [], 'count' => 0])); - $mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); + $mockProjectStore = $this + ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->testedService = new BuildService($this->configuration, $this->mockBuildStore, $mockProjectStore); } @@ -178,12 +194,18 @@ public function testExecute_CreateDuplicateBuild() public function testExecute_DeleteBuild() { - $store = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock(); + $store = $this + ->getMockBuilder('PHPCensor\Store\BuildStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $store->expects($this->once()) ->method('delete') ->will($this->returnValue(true)); - $mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); + $mockProjectStore = $this + ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $service = new BuildService($this->configuration, $store, $mockProjectStore); $build = new Build(); diff --git a/tests/src/Service/ProjectServiceTest.php b/tests/src/Service/ProjectServiceTest.php index b7dc7b276..80a1349d9 100644 --- a/tests/src/Service/ProjectServiceTest.php +++ b/tests/src/Service/ProjectServiceTest.php @@ -2,6 +2,8 @@ namespace Tests\PHPCensor\Service; +use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Model\Project; use PHPCensor\Service\ProjectService; use PHPUnit\Framework\TestCase; @@ -13,7 +15,6 @@ */ class ProjectServiceTest extends TestCase { - /** * @var ProjectService $testedService */ @@ -24,10 +25,21 @@ class ProjectServiceTest extends TestCase */ protected $mockProjectStore; + protected ConfigurationInterface $configuration; + + protected DatabaseManager $databaseManager; + protected function setUp(): void { + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + $this->mockProjectStore = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->setConstructorArgs([$this->databaseManager]) ->getMock(); $this->mockProjectStore @@ -302,7 +314,10 @@ public function testExecuteEmptyPublicStatus() public function testExecuteDeleteProject() { - $store = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); + $store = $this + ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $store->expects($this->once()) ->method('delete') ->will($this->returnValue(true)); diff --git a/tests/src/Service/UserServiceTest.php b/tests/src/Service/UserServiceTest.php index 37aa9bfc5..f144c7ea7 100644 --- a/tests/src/Service/UserServiceTest.php +++ b/tests/src/Service/UserServiceTest.php @@ -2,6 +2,8 @@ namespace Tests\PHPCensor\Service; +use PHPCensor\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Model\User; use PHPCensor\Service\UserService; use PHPUnit\Framework\TestCase; @@ -24,12 +26,26 @@ class UserServiceTest extends TestCase */ protected $mockUserStore; + protected ConfigurationInterface $configuration; + + protected DatabaseManager $databaseManager; + protected function setUp(): void { - $this->mockUserStore = $this->getMockBuilder('PHPCensor\Store\UserStore')->getMock(); - $this->mockUserStore->expects($this->any()) - ->method('save') - ->will($this->returnArgument(0)); + $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $this->databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + + $this->mockUserStore = $this + ->getMockBuilder('PHPCensor\Store\UserStore') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); + $this->mockUserStore + ->expects($this->any()) + ->method('save') + ->will($this->returnArgument(0)); $this->testedService = new UserService($this->mockUserStore); } From f85549cd72fabed45ca6c753f9f6e6de205acc89 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 19 May 2021 22:14:00 +0700 Subject: [PATCH 008/212] Refactoring: Exception types. --- src/Builder.php | 5 ++--- src/Command/Action/CreateAdmin.php | 3 ++- src/Command/InstallCommand.php | 6 +++--- src/Command/WorkerCommand.php | 2 +- src/Console/Application.php | 3 ++- src/Controller/ProjectController.php | 5 +++-- src/Controller/WebhookController.php | 16 +++++++++------- src/DatabaseManager.php | 3 ++- src/Exception/InvalidArgumentException.php | 4 +--- src/Exception/LogicException.php | 17 +++++++++++++++++ src/Exception/RuntimeException.php | 17 +++++++++++++++++ src/Form/Validator/Yaml.php | 4 ++-- src/Helper/CommandExecutor.php | 4 ++-- .../20200505070903_initial_migration_v2.php | 3 ++- src/Model/Build/BitbucketServerBuild.php | 9 +++++---- src/Plugin/BitbucketNotify.php | 3 ++- src/Plugin/CampfireNotify.php | 3 ++- src/Plugin/Codeception.php | 3 ++- src/Plugin/CopyBuild.php | 4 ++-- src/Plugin/FlowdockNotify.php | 6 ++++-- src/Plugin/HipchatNotify.php | 3 ++- src/Plugin/Mage.php | 13 +++++++------ src/Plugin/Mage3.php | 13 +++++++------ src/Plugin/Mysql.php | 8 +++++--- src/Plugin/Pdepend.php | 3 ++- src/Plugin/Phan.php | 5 +++-- src/Plugin/Phing.php | 5 +++-- src/Plugin/PhpCodeSniffer.php | 3 ++- src/Plugin/PhpCpd.php | 3 ++- src/Plugin/PhpCsFixer.php | 3 ++- src/Plugin/PhpMessDetector.php | 3 ++- src/Plugin/PhpUnit.php | 6 +++--- src/Plugin/SecurityChecker.php | 5 +++-- src/Plugin/SensiolabsInsight.php | 2 +- src/Plugin/SlackNotify.php | 3 ++- src/Plugin/TelegramNotify.php | 5 +++-- src/Plugin/Util/Executor.php | 3 ++- src/Plugin/Util/Factory.php | 3 ++- src/Plugin/Util/PhpUnitResultJson.php | 3 ++- src/Plugin/Util/PhpUnitResultJunit.php | 2 +- src/Plugin/WebhookNotify.php | 5 +++-- src/Store.php | 2 +- src/Store/EnvironmentStore.php | 2 +- src/Store/ProjectStore.php | 2 +- src/View.php | 2 +- tests/src/FormTest.php | 4 ++-- 46 files changed, 147 insertions(+), 84 deletions(-) create mode 100644 src/Exception/LogicException.php create mode 100644 src/Exception/RuntimeException.php diff --git a/src/Builder.php b/src/Builder.php index f939e4daa..623771e90 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -4,6 +4,7 @@ use DateTime; use Exception; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Helper\MailerFactory; use PHPCensor\Logging\BuildLogger; @@ -156,8 +157,6 @@ public function getCurrentStage(): ?string * Set the config array, as read from .php-censor.yml * * @param array $config - * - * @throws Exception */ public function setConfig(array $config) { @@ -461,7 +460,7 @@ protected function setupBuild() $this->buildLogger->logSuccess(sprintf('Working copy created: %s', $this->buildPath)); if (!$workingCopySuccess) { - throw new Exception('Could not create a working copy.'); + throw new RuntimeException('Could not create a working copy.'); } return true; diff --git a/src/Command/Action/CreateAdmin.php b/src/Command/Action/CreateAdmin.php index 17a6e5dc5..0297b77cc 100644 --- a/src/Command/Action/CreateAdmin.php +++ b/src/Command/Action/CreateAdmin.php @@ -5,6 +5,7 @@ namespace PHPCensor\Command\Action; use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Service\UserService; use PHPCensor\Store\UserStore; use Symfony\Component\Console\Helper\QuestionHelper; @@ -82,7 +83,7 @@ public function create(array $adminDetails): void try { $adminUser = $this->userStore->getByEmail($adminDetails['email']); if ($adminUser) { - throw new \RuntimeException('Admin account already exists!'); + throw new RuntimeException('Admin account already exists!'); } $userService = new UserService($this->userStore); diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index c9a80f324..d9bd0925f 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -11,11 +11,11 @@ use PHPCensor\Command\Action\CreateAdmin; use PHPCensor\Configuration; use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\ProjectGroup; use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectGroupStore; use PHPCensor\Store\UserStore; -use RuntimeException; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -207,7 +207,7 @@ private function checkRequirements(OutputInterface $output) } if ($errors) { - throw new Exception( + throw new RuntimeException( 'PHP Censor cannot be installed, as not all requirements are met. ' . 'Please review the errors above before continuing.' ); @@ -262,7 +262,7 @@ private function getConfigInformation(InputInterface $input, OutputInterface $ou $urlValidator = function ($answer) { if (!\filter_var($answer, FILTER_VALIDATE_URL)) { - throw new Exception('Must be a valid URL.'); + throw new InvalidArgumentException('Must be a valid URL.'); } return \rtrim($answer, '/'); diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 35f45a898..742774feb 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -8,10 +8,10 @@ use Pheanstalk\Pheanstalk; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Service\BuildService; use PHPCensor\Worker\BuildWorker; use Psr\Log\LoggerInterface; -use RuntimeException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; diff --git a/src/Console/Application.php b/src/Console/Application.php index e1f85f2b6..a07c64b0d 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -23,6 +23,7 @@ use PHPCensor\Command\WorkerCommand; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Logging\AnsiFormatter; use PHPCensor\Logging\Handler; use PHPCensor\Service\BuildService; @@ -99,7 +100,7 @@ public function __construct( $oldDatabaseSettings = $applicationConfig->get('b8.database', []); $databaseSettings = $applicationConfig->get('php-censor.database', []); if ($oldDatabaseSettings && !$databaseSettings) { - throw new \RuntimeException( + throw new InvalidArgumentException( 'Missing database settings in application config "config.yml" (Section: "php-censor.database")' ); } diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 206ad1bbf..045ace788 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -22,6 +22,7 @@ use PHPCensor\WebController; use PHPCensor\Helper\Branch; use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Exception\RuntimeException; /** * Project Controller - Allows users to create, edit and view projects. @@ -692,9 +693,9 @@ protected function getReferenceValidator($values) ]; if (in_array($type, $validators) && !preg_match($validators[$type]['regex'], $val)) { - throw new Exception($validators[$type]['message']); + throw new RuntimeException($validators[$type]['message']); } elseif (Project::TYPE_LOCAL === $type && !is_dir($val)) { - throw new Exception(Lang::get('error_path')); + throw new RuntimeException(Lang::get('error_path')); } return true; diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index 42d18d675..a78265a86 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -5,8 +5,10 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Controller; +use PHPCensor\Exception\HttpException\ForbiddenException; use PHPCensor\Exception\HttpException\NotFoundException; use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Helper\Lang; use PHPCensor\Http\Response; use PHPCensor\Model\Build; @@ -292,7 +294,7 @@ protected function createBuild( protected function fetchProject($projectId, array $expectedType) { if (empty($projectId)) { - throw new Exception('Project does not exist: ' . $projectId); + throw new NotFoundException('Project does not exist: ' . $projectId); } if (is_numeric($projectId)) { @@ -300,16 +302,16 @@ protected function fetchProject($projectId, array $expectedType) } else { $projects = $this->projectStore->getByTitle($projectId, 2); if ($projects['count'] < 1) { - throw new Exception('Project does not found: ' . $projectId); + throw new NotFoundException('Project does not found: ' . $projectId); } if ($projects['count'] > 1) { - throw new Exception('Project id is ambiguous: ' . $projectId); + throw new NotFoundException('Project id is ambiguous: ' . $projectId); } $project = reset($projects['items']); } if (!in_array($project->getType(), $expectedType, true)) { - throw new Exception('Wrong project type: ' . $project->getType()); + throw new NotFoundException('Wrong project type: ' . $project->getType()); } return $project; @@ -529,7 +531,7 @@ protected function bitbucketPullRequest(Project $project, array $payload) $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword)) { - throw new Exception('Please provide Username and App Password of your Bitbucket account.'); + throw new ForbiddenException('Please provide Username and App Password of your Bitbucket account.'); } $commitsUrl = $payload['pullrequest']['links']['commits']['href']; @@ -542,7 +544,7 @@ protected function bitbucketPullRequest(Project $project, array $payload) // Check we got a success response: if ($httpStatus < 200 || $httpStatus >= 300) { - throw new Exception('Could not get commits, failed API request.'); + throw new RuntimeException('Could not get commits, failed API request.'); } $results = []; @@ -833,7 +835,7 @@ protected function githubPullRequest(Project $project, array $payload) // Check we got a success response: if ($status < 200 || $status >= 300) { - throw new Exception('Could not get commits, failed API request.'); + throw new RuntimeException('Could not get commits, failed API request.'); } $results = []; diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index 3b0f84243..b98d51f95 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -5,6 +5,7 @@ namespace PHPCensor; use PHPCensor\Common\Exception\Exception; +use PHPCensor\Exception\RuntimeException; class DatabaseManager { @@ -84,7 +85,7 @@ public function getConnection(string $type = 'read'): DatabaseConnection // No connection? Oh dear. if (!$connection && $type === 'read') { - throw new Exception('Could not connect to any ' . $type . ' servers.'); + throw new RuntimeException('Could not connect to any ' . $type . ' servers.'); } $this->connections[$type] = $connection; diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php index 09d1d2fec..93b9e5024 100644 --- a/src/Exception/InvalidArgumentException.php +++ b/src/Exception/InvalidArgumentException.php @@ -4,14 +4,12 @@ namespace PHPCensor\Exception; -use PHPCensor\Common\Exception\Exception; - /** * @package PHP Censor * @subpackage Application * * @author Dmitry Khomutov */ -class InvalidArgumentException extends Exception +class InvalidArgumentException extends LogicException { } diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php new file mode 100644 index 000000000..ed631b06d --- /dev/null +++ b/src/Exception/LogicException.php @@ -0,0 +1,17 @@ + + */ +class LogicException extends Exception +{ +} diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php new file mode 100644 index 000000000..724713fd2 --- /dev/null +++ b/src/Exception/RuntimeException.php @@ -0,0 +1,17 @@ + + */ +class RuntimeException extends Exception +{ +} diff --git a/src/Form/Validator/Yaml.php b/src/Form/Validator/Yaml.php index 469b24554..5b898fe8b 100644 --- a/src/Form/Validator/Yaml.php +++ b/src/Form/Validator/Yaml.php @@ -2,7 +2,7 @@ namespace PHPCensor\Form\Validator; -use Exception; +use PHPCensor\Exception\RuntimeException; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Parser; @@ -16,7 +16,7 @@ public function __invoke($value) try { $this->getParser()->parse($value); } catch (ParseException $e) { - throw new Exception($e->getMessage()); + throw new RuntimeException($e->getMessage()); } return true; diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index 7d85671f8..879cf1fca 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -2,7 +2,7 @@ namespace PHPCensor\Helper; -use Exception; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Logging\BuildLogger; use Symfony\Component\Process\Process; @@ -359,7 +359,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ } } - throw new Exception(sprintf('Could not find %s', implode('/', $binary))); + throw new RuntimeException(sprintf('Could not find %s', implode('/', $binary))); } /** diff --git a/src/Migrations/20200505070903_initial_migration_v2.php b/src/Migrations/20200505070903_initial_migration_v2.php index 314022fb9..74a7ef0e9 100644 --- a/src/Migrations/20200505070903_initial_migration_v2.php +++ b/src/Migrations/20200505070903_initial_migration_v2.php @@ -3,6 +3,7 @@ use Phinx\Db\Adapter\MysqlAdapter; use Phinx\Migration\AbstractMigration; use PHPCensor\Model\Build; +use PHPCensor\Exception\RuntimeException; class InitialMigrationV2 extends AbstractMigration { @@ -27,7 +28,7 @@ private function isNewInstallationUp(): bool } if ($isIssetBuild || ($isIssetBuilds && !$this->getLatestV1Migration())) { - throw new \RuntimeException( + throw new RuntimeException( 'You should upgrade your PHP Censor to latest 1.3 release before you can upgrade it to release 2.0' ); } diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index 88947dec3..65d7022f1 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; class BitbucketServerBuild extends GitBuild @@ -115,13 +116,13 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul try { if (in_array($this->getSource(), Build::$pullRequestSources, true)) { $diff = $this->getPullRequestDiff($builder, $cloneTo, $extra['remote_branch']); - + $diffFile = $this->writeDiff($builder->buildPath, $diff); $cmd = 'cd "%s" && git checkout -b php-censor/' . $this->getId(); $success = $builder->executeCommand($cmd, $cloneTo); - + if ($success) { $applyCmd = 'git apply "%s"'; $success = $builder->executeCommand($applyCmd, $diffFile); @@ -140,7 +141,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul return $success; } - + /** * Create request patch with diff * @@ -157,7 +158,7 @@ protected function getPullRequestDiff(Builder $builder, $cloneTo, $targetBranch) return $builder->getLastOutput(); } - throw new Exception('Unable to create diff patch.'); + throw new RuntimeException('Unable to create diff patch.'); } /** diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index 89ab0866d..f60110d3e 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -5,6 +5,7 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Util\BitbucketNotifyPluginResult; @@ -106,7 +107,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) empty($this->projectKey) || empty($this->repositorySlug) ) { - throw new Exception('Please define the url for bitbucket plugin!'); + throw new InvalidArgumentException('Please define the url for bitbucket plugin!'); } } diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index d732f55d0..12bdd38ea 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -60,7 +61,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->room = $campfire['room']; } } else { - throw new Exception('No connection parameters given for Campfire plugin'); + throw new InvalidArgumentException('No connection parameters given for Campfire plugin'); } } diff --git a/src/Plugin/Codeception.php b/src/Plugin/Codeception.php index c5258c31c..90131176d 100644 --- a/src/Plugin/Codeception.php +++ b/src/Plugin/Codeception.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser; @@ -103,7 +104,7 @@ public static function findConfigFile($buildPath) public function execute() { if (empty($this->ymlConfigFile)) { - throw new Exception("No configuration file found"); + throw new InvalidArgumentException("No configuration file found"); } // Run any config files first. This can be either a single value or an array. diff --git a/src/Plugin/CopyBuild.php b/src/Plugin/CopyBuild.php index 37c0abfe8..294542d55 100644 --- a/src/Plugin/CopyBuild.php +++ b/src/Plugin/CopyBuild.php @@ -3,9 +3,9 @@ namespace PHPCensor\Plugin; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; -use RuntimeException; /** * Copy Build Plugin - Copies the entire build to another directory. @@ -63,7 +63,7 @@ public function execute() $cmd = 'cd "%s" && mkdir -p "%s" && cp -R %s/. "%s"'; $success = $this->builder->executeCommand($cmd, $buildPath, $this->directory, rtrim($buildPath, '/'), $this->directory); - + $this->deleteIgnoredFiles(); return $success; diff --git a/src/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php index 4acb9e2b8..c690a1da0 100644 --- a/src/Plugin/FlowdockNotify.php +++ b/src/Plugin/FlowdockNotify.php @@ -6,6 +6,8 @@ use FlowdockClient\Api\Push\Push; use FlowdockClient\Api\Push\TeamInboxMessage; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -39,7 +41,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) parent::__construct($builder, $build, $options); if (!is_array($options) || (!isset($options['api_key']) && !isset($options['auth_token']))) { - throw new Exception('Please define the "auth_token" for Flowdock Notify plugin!'); + throw new InvalidArgumentException('Please define the "auth_token" for Flowdock Notify plugin!'); } if (\array_key_exists('auth_token', $options)) { @@ -70,7 +72,7 @@ public function execute() ->setContent($message); if (!$push->sendTeamInboxMessage($flowMessage, ['connect_timeout' => 5000, 'timeout' => 5000])) { - throw new Exception(sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors())); + throw new RuntimeException(sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors())); } return true; } diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index 0bc40f614..268b4f2c7 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -5,6 +5,7 @@ use Exception; use HipChat\HipChat; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -43,7 +44,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->cookie = "php-censor-cookie"; if (!\is_array($options) || !isset($options['room']) || (!isset($options['authToken']) && !isset($options['auth_token']))) { - throw new Exception('Please define room and authToken for hipchat_notify plugin.'); + throw new InvalidArgumentException('Please define room and authToken for hipchat_notify plugin.'); } if (\array_key_exists('auth_token', $options)) { diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 50bc440e7..efabe8af6 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -7,6 +7,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -74,34 +75,34 @@ protected function getMageLog() { $logsDir = $this->build->getBuildPath() . '/.mage/logs'; if (!is_dir($logsDir)) { - throw new Exception('Log directory not found'); + throw new RuntimeException('Log directory not found'); } $list = scandir($logsDir); if ($list === false) { - throw new Exception('Log dir read fail'); + throw new RuntimeException('Log dir read fail'); } $list = array_filter($list, function ($name) { return preg_match('/^log-\d+-\d+\.log$/', $name); }); if (empty($list)) { - throw new Exception('Log dir filter fail'); + throw new RuntimeException('Log dir filter fail'); } $res = sort($list); if ($res === false) { - throw new Exception('Logs sort fail'); + throw new RuntimeException('Logs sort fail'); } $lastLogFile = end($list); if ($lastLogFile === false) { - throw new Exception('Get last Log name fail'); + throw new RuntimeException('Get last Log name fail'); } $logContent = file_get_contents($logsDir . '/' . $lastLogFile); if ($logContent === false) { - throw new Exception('Get last Log content fail'); + throw new RuntimeException('Get last Log content fail'); } $lines = explode("\n", $logContent); diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index 05507ee9c..cff72e112 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -7,6 +7,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -79,34 +80,34 @@ protected function getMageLog() { $logsDir = $this->build->getBuildPath() . (!empty($this->mageLogDir) ? '/' . $this->mageLogDir : ''); if (!is_dir($logsDir)) { - throw new Exception('Log directory not found'); + throw new RuntimeException('Log directory not found'); } $list = scandir($logsDir); if ($list === false) { - throw new Exception('Log dir read fail'); + throw new RuntimeException('Log dir read fail'); } $list = array_filter($list, function ($name) { return preg_match('/^\d+_\d+\.log$/', $name); }); if (empty($list)) { - throw new Exception('Log dir filter fail'); + throw new RuntimeException('Log dir filter fail'); } $res = sort($list); if ($res === false) { - throw new Exception('Logs sort fail'); + throw new RuntimeException('Logs sort fail'); } $lastLogFile = end($list); if ($lastLogFile === false) { - throw new Exception('Get last Log name fail'); + throw new RuntimeException('Get last Log name fail'); } $logContent = file_get_contents($logsDir . '/' . $lastLogFile); if ($logContent === false) { - throw new Exception('Get last Log content fail'); + throw new RuntimeException('Get last Log content fail'); } $lines = explode("\n", $logContent); diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 6d26dbb37..cd8b9c747 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -5,6 +5,8 @@ use Exception; use PDO; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -164,19 +166,19 @@ public function execute() protected function executeFile(array $query) { if (!isset($query['file'])) { - throw new Exception('Import statement must contain a \'file\' key'); + throw new InvalidArgumentException('Import statement must contain a \'file\' key'); } $importFile = $this->builder->buildPath . $this->builder->interpolate($query['file']); if (!is_readable($importFile)) { - throw new Exception(sprintf('Cannot open SQL import file: %s', $importFile)); + throw new RuntimeException(sprintf('Cannot open SQL import file: %s', $importFile)); } $database = isset($query['database']) ? $this->builder->interpolate($query['database']) : null; $importCommand = $this->getImportCommand($importFile, $database); if (!$this->builder->executeCommand($importCommand)) { - throw new Exception('Unable to execute SQL file'); + throw new RuntimeException('Unable to execute SQL file'); } return true; diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index 6d078be23..cab18f007 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -5,6 +5,7 @@ use Exception; use PHPCensor\Builder; use PHPCensor\Configuration; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use Symfony\Component\Filesystem\Filesystem; @@ -98,7 +99,7 @@ public function execute() } if (!is_writable($this->buildLocation)) { - throw new Exception(sprintf( + throw new RuntimeException(sprintf( 'The location %s is not writable or does not exist.', $this->buildLocation )); diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index d0dc6e476..02af51c33 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; @@ -59,7 +60,7 @@ public function execute() } if (!is_writable($this->location)) { - throw new Exception(sprintf('The location %s is not writable or does not exist.', $this->location)); + throw new RuntimeException(sprintf('The location %s is not writable or does not exist.', $this->location)); } // Find PHP files in a file @@ -108,7 +109,7 @@ protected function processReport($jsonString) if ($json === false || !is_array($json)) { $this->builder->log($jsonString); - throw new Exception('Could not process the report generated by Phan.'); + throw new RuntimeException('Could not process the report generated by Phan.'); } $warnings = 0; diff --git a/src/Plugin/Phing.php b/src/Plugin/Phing.php index 9a3c543d1..67eb2e4a0 100644 --- a/src/Plugin/Phing.php +++ b/src/Plugin/Phing.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -126,7 +127,7 @@ public function getBuildFile() public function setBuildFile($buildFile) { if (!file_exists($this->directory . $buildFile)) { - throw new Exception('Specified build file does not exist.'); + throw new RuntimeException('Specified build file does not exist.'); } $this->buildFile = $buildFile; @@ -202,7 +203,7 @@ public function getPropertyFile() public function setPropertyFile($propertyFile) { if (!file_exists($this->directory . '/' . $propertyFile)) { - throw new Exception('Specified property file does not exist.'); + throw new RuntimeException('Specified property file does not exist.'); } $this->propertyFile = $propertyFile; diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index cfc7a4cab..4a75de2c8 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -9,6 +9,7 @@ use PHPCensor\Model\BuildError; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; +use PHPCensor\Exception\RuntimeException; /** * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing. @@ -240,7 +241,7 @@ protected function processReport($output) if (!is_array($data)) { $this->builder->log($output); - throw new Exception('Could not process the report generated by PHP Code Sniffer.'); + throw new RuntimeException('Could not process the report generated by PHP Code Sniffer.'); } $errors = $data['totals']['errors']; diff --git a/src/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php index 3287e80cf..875829cd2 100644 --- a/src/Plugin/PhpCpd.php +++ b/src/Plugin/PhpCpd.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; @@ -109,7 +110,7 @@ protected function processReport($xmlString) if (false === $xml) { $this->builder->log($xmlString); - throw new Exception('Could not process the report generated by PHPCpd.'); + throw new RuntimeException('Could not process the report generated by PHPCpd.'); } $warnings = 0; diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index 31e09e9d6..030b3a2ba 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -4,6 +4,7 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; @@ -172,7 +173,7 @@ protected function processReport($output) if (!is_array($data)) { $this->builder->log($output); - throw new Exception('Could not process the report generated by PHP CS Fixer.'); + throw new RuntimeException('Could not process the report generated by PHP CS Fixer.'); } $warnings = 0; diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index 2dcd57533..dc1ff08dc 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -8,6 +8,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; +use PHPCensor\Exception\RuntimeException; /** * PHP Mess Detector Plugin - Allows PHP Mess Detector testing. @@ -121,7 +122,7 @@ protected function processReport($xmlString) if (false === $xml) { $this->builder->log($xmlString); - throw new Exception('Could not process PHPMD report XML.'); + throw new RuntimeException('Could not process PHPMD report XML.'); } $warnings = 0; diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index ba61e6c49..816c7ba2c 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -13,7 +13,7 @@ use PHPCensor\Plugin\Util\PhpUnitResultJunit; use PHPCensor\ZeroConfigPluginInterface; use Symfony\Component\Filesystem\Filesystem; -use PHPCensor\Configuration; +use PHPCensor\Exception\RuntimeException; /** * PHP Unit Plugin - A rewrite of the original PHP Unit plugin @@ -179,7 +179,7 @@ protected function runConfig($directory, $configFile, $logFormat) } if (!is_writable($this->buildLocation)) { - throw new Exception(sprintf( + throw new RuntimeException(sprintf( 'The location %s is not writable or does not exist.', $this->buildLocation )); @@ -321,7 +321,7 @@ protected function processResults($logFile, $logFormat) } unlink($logFile); } else { - throw new Exception('log output file does not exist: ' . $logFile); + throw new RuntimeException('log output file does not exist: ' . $logFile); } } } diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index 283d8c9f0..d78cb0001 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -8,6 +8,7 @@ use PHPCensor\Model\BuildError; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; +use PHPCensor\Exception\RuntimeException; /** * SensioLabs Security Checker Plugin @@ -81,7 +82,7 @@ public function execute() { $composerLockFile = $this->builder->buildPath . 'composer.lock'; if (!\is_file($composerLockFile)) { - throw new \RuntimeException('Lock file does not exist.'); + throw new RuntimeException('Lock file does not exist.'); } if ('symfony' === $this->binaryType) { @@ -124,7 +125,7 @@ public function execute() $success = false; } } elseif (null === $warnings && $result) { - throw new \RuntimeException('invalid json: '.$result); + throw new RuntimeException('invalid json: '.$result); } return $success; diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index b406a173d..62321cc4e 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -7,7 +7,7 @@ use PHPCensor\Builder; use PHPCensor\Model\Build; use PHPCensor\Plugin; -use RuntimeException; +use PHPCensor\Exception\RuntimeException; /** * Sensiolabs Insight Plugin - Allows Sensiolabs Insight testing. diff --git a/src/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php index 674291a13..200e60fe3 100644 --- a/src/Plugin/SlackNotify.php +++ b/src/Plugin/SlackNotify.php @@ -7,6 +7,7 @@ use Maknz\Slack\AttachmentField; use Maknz\Slack\Client; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -72,7 +73,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->icon = $options['icon']; } } else { - throw new Exception('Please define the webhook_url for slack_notify plugin!'); + throw new InvalidArgumentException('Please define the webhook_url for slack_notify plugin!'); } } diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index 210a96b7e..8541fc4a7 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -5,6 +5,7 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -42,11 +43,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) parent::__construct($builder, $build, $options); if (empty($options['auth_token']) && empty($options['api_key'])) { - throw new Exception("Not setting telegram 'auth_token'"); + throw new InvalidArgumentException("Not setting telegram 'auth_token'"); } if (empty($options['recipients'])) { - throw new Exception("Not setting recipients"); + throw new InvalidArgumentException("Not setting recipients"); } if (\array_key_exists('auth_token', $options)) { diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 253529ca0..aef238a74 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -3,6 +3,7 @@ namespace PHPCensor\Plugin\Util; use Exception; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Helper\Lang; use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; @@ -182,7 +183,7 @@ protected function doExecutePlugins($plugins, $stage) $this->logger->logFailure('PLUGIN: FAILED'); // If we're in the "setup" stage, execution should not continue after // a plugin has failed: - throw new Exception('Plugin failed: ' . $plugin); + throw new RuntimeException('Plugin failed: ' . $plugin); } elseif ($stage === Build::STAGE_DEPLOY) { $this->logger->logFailure('PLUGIN: FAILED'); $success = false; diff --git a/src/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php index 9cfcdb549..cffe6c7c3 100644 --- a/src/Plugin/Util/Factory.php +++ b/src/Plugin/Util/Factory.php @@ -5,6 +5,7 @@ use Closure; use DomainException; use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Plugin; use Pimple\Container; use ReflectionClass; @@ -212,7 +213,7 @@ private function addArgFromParam($existingArgs, ReflectionParameter $param) } elseif ($arg === null && $param->isOptional()) { $existingArgs[] = $param->getDefaultValue(); } else { - throw new DomainException( + throw new RuntimeException( "Unsatisfied dependency: " . $param->getName() ); } diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index 35f36093a..cacf3c5c0 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -3,6 +3,7 @@ namespace PHPCensor\Plugin\Util; use Exception; +use PHPCensor\Exception\RuntimeException; /** * Class PhpUnitResult parses the results for the PhpUnitV2 plugin @@ -93,7 +94,7 @@ protected function getSeverity($event) $severity = self::SEVERITY_PASS; break; default: - throw new Exception("Unexpected PHPUnit test status: {$status}"); + throw new RuntimeException("Unexpected PHPUnit test status: {$status}"); break; } diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index 79e1d02fd..a45364b64 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -3,8 +3,8 @@ namespace PHPCensor\Plugin\Util; use Exception; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Helper\Xml; -use RuntimeException; use SimpleXMLElement; /** diff --git a/src/Plugin/WebhookNotify.php b/src/Plugin/WebhookNotify.php index ba8c458b1..6c7b41df7 100644 --- a/src/Plugin/WebhookNotify.php +++ b/src/Plugin/WebhookNotify.php @@ -7,6 +7,7 @@ use GuzzleHttp\Exception\GuzzleException; use PHPCensor\Builder; use PHPCensor\Exception\HttpException; +use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; @@ -40,11 +41,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) parent::__construct($builder, $build, $options); if (!is_array($options)) { - throw new Exception('Please configure the options for the webhook_notify plugin!'); + throw new InvalidArgumentException('Please configure the options for the webhook_notify plugin!'); } if (!isset($options['url'])) { - throw new Exception('Please define the url for webhook_notify plugin!'); + throw new InvalidArgumentException('Please define the url for webhook_notify plugin!'); } $this->url = trim($options['url']); } diff --git a/src/Store.php b/src/Store.php index 99d10abe3..a9eb41118 100644 --- a/src/Store.php +++ b/src/Store.php @@ -5,7 +5,7 @@ use Exception; use PDO; use PHPCensor\Exception\InvalidArgumentException; -use RuntimeException; +use PHPCensor\Exception\RuntimeException; abstract class Store { diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 4f0b80cd3..2e95b0ed1 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -111,7 +111,7 @@ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read' public function getByProjectId($projectId, $useConnection = 'read') { if (is_null($projectId)) { - throw new Exception('Value passed to ' . __FUNCTION__ . ' cannot be null.'); + throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id'; diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 75d5e1184..efb6655ec 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -213,7 +213,7 @@ public function getAll($archived = false) public function getByGroupId($groupId, $archived = false, $limit = 1000, $useConnection = 'read') { if (is_null($groupId)) { - throw new Exception('Value passed to ' . __FUNCTION__ . ' cannot be null.'); + throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } $archived = (int)$archived; diff --git a/src/View.php b/src/View.php index be1d257f9..b8f43f16a 100644 --- a/src/View.php +++ b/src/View.php @@ -2,10 +2,10 @@ namespace PHPCensor; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\User; use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; -use RuntimeException; class View { diff --git a/tests/src/FormTest.php b/tests/src/FormTest.php index ea42c0e30..f919fc692 100644 --- a/tests/src/FormTest.php +++ b/tests/src/FormTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor; -use Exception; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Form; use PHPUnit\Framework\TestCase; @@ -85,7 +85,7 @@ public function testInputValidation() $f->setValidator(function ($item) { if ($item != 'input-value') { - throw new Exception('Invalid input value.'); + throw new RuntimeException('Invalid input value.'); } }); From f65a017c6e6aafa61ee36b92ce52ad27614177cd Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 19 May 2021 22:14:43 +0700 Subject: [PATCH 009/212] Refactoring: Improved stores management. --- bin/console | 4 +- bootstrap.php | 7 +-- public/index.php | 4 +- src/Application.php | 29 ++++++++- src/BuildFactory.php | 22 +++++-- src/Builder.php | 24 +++++-- src/Command/Action/CreateAdmin.php | 7 ++- src/Command/Command.php | 5 ++ src/Command/CreateAdminCommand.php | 5 +- src/Command/CreateBuildCommand.php | 7 ++- src/Command/InstallCommand.php | 11 ++-- src/Command/RebuildQueueCommand.php | 12 ++-- src/Command/RemoveOldBuildsCommand.php | 4 +- src/Command/WorkerCommand.php | 9 ++- src/Configuration.php | 6 ++ src/ConfigurationInterface.php | 6 ++ src/Console/Application.php | 54 ++++++++++------ src/Controller.php | 21 +++---- src/Controller/BuildController.php | 59 ++++++++++++----- src/Controller/BuildStatusController.php | 10 +-- src/Controller/GroupController.php | 10 +-- src/Controller/ProjectController.php | 30 +++++---- src/Controller/SessionController.php | 5 +- src/Controller/UserController.php | 13 ++-- src/Controller/WebhookController.php | 18 +++--- .../WidgetAllProjectsController.php | 7 +-- .../WidgetBuildErrorsController.php | 5 +- src/Controller/WidgetLastBuildsController.php | 6 +- src/DatabaseConnection.php | 6 ++ src/DatabaseManager.php | 14 ++--- src/Exception/RuntimeException.php | 17 ----- src/Helper/BuildInterpolator.php | 13 +++- src/Helper/Lang.php | 14 ++--- src/Logging/BuildDBLogHandler.php | 24 +++---- src/Model.php | 42 +++++-------- src/Model/Base/Build.php | 9 ++- src/Model/Base/BuildError.php | 2 +- src/Model/Base/BuildMeta.php | 2 +- src/Model/Base/Environment.php | 2 +- src/Model/Base/Project.php | 2 +- src/Model/Base/ProjectGroup.php | 2 +- src/Model/Base/User.php | 2 +- src/Model/Build.php | 11 ++-- src/Model/Build/GitBuild.php | 4 +- src/Model/BuildError.php | 3 +- src/Model/BuildMeta.php | 3 +- src/Model/Project.php | 13 ++-- src/Model/ProjectGroup.php | 3 +- src/Plugin.php | 7 +++ src/Plugin/BitbucketNotify.php | 11 ++-- src/Plugin/Util/Executor.php | 22 ++++--- src/Security/Authentication/Service.php | 23 +++---- .../UserProvider/AbstractProvider.php | 21 ++++--- .../Authentication/UserProvider/Ldap.php | 5 +- src/Service/BuildService.php | 9 ++- src/Service/ProjectService.php | 22 +++---- src/Service/UserService.php | 24 +++---- src/Store.php | 9 ++- src/Store/BuildErrorStore.php | 4 +- src/Store/BuildErrorWriter.php | 7 ++- src/Store/BuildMetaStore.php | 8 +-- src/Store/BuildStore.php | 32 +++++----- src/Store/EnvironmentStore.php | 6 +- src/Store/Factory.php | 63 ------------------- src/Store/ProjectGroupStore.php | 4 +- src/Store/ProjectStore.php | 10 +-- src/Store/UserStore.php | 10 +-- src/StoreRegistry.php | 34 ++++++++++ src/View.php | 18 ------ src/View/Build/view.phtml | 18 ++---- src/View/BuildStatus/view.phtml | 7 ++- src/View/Group/index.phtml | 8 ++- src/View/Project/ajax-builds.phtml | 10 +-- src/View/Project/view.phtml | 8 ++- src/View/User/index.phtml | 5 +- src/View/WidgetLastBuilds/update.phtml | 6 +- src/View/exception.phtml | 6 +- src/View/layout.phtml | 6 +- src/WebController.php | 27 ++++---- src/Worker/BuildWorker.php | 26 +++++--- tests/src/Command/CreateAdminCommandTest.php | 8 ++- tests/src/Command/CreateBuildCommandTest.php | 14 ++++- tests/src/Helper/BuildInterpolatorTest.php | 23 +++++-- tests/src/Model/Base/BuildErrorTest.php | 42 +++++++++---- tests/src/Model/Base/BuildMetaTest.php | 26 ++++++-- tests/src/Model/Base/BuildTest.php | 58 ++++++++++------- tests/src/Model/Base/EnvironmentTest.php | 26 ++++++-- tests/src/Model/Base/ProjectGroupTest.php | 28 +++++++-- tests/src/Model/Base/ProjectTest.php | 52 +++++++++------ tests/src/Model/Base/UserTest.php | 38 +++++++---- tests/src/Model/BuildTest.php | 34 +++++++--- tests/src/Model/ProjectTest.php | 20 +++++- tests/src/Plugin/EmailTest.php | 15 ++++- tests/src/Plugin/PhpUnitTest.php | 21 +++++-- tests/src/Plugin/Util/ExecutorTest.php | 19 +++++- tests/src/PluginTest.php | 22 ++++++- .../Security/Authentication/ServiceTest.php | 19 ++++-- .../UserProvider/InternalTest.php | 21 +++++-- tests/src/Service/BuildServiceTest.php | 38 ++++++++--- ...iceTest.php => BuildStatusServiceTest.php} | 23 +++++-- tests/src/Service/ProjectServiceTest.php | 21 ++++--- tests/src/Service/UserServiceTest.php | 19 ++++-- 102 files changed, 1018 insertions(+), 633 deletions(-) mode change 100755 => 100644 bin/console delete mode 100644 src/Exception/RuntimeException.php delete mode 100644 src/Store/Factory.php create mode 100644 src/StoreRegistry.php rename tests/src/Service/{BuiltStatusServiceTest.php => BuildStatusServiceTest.php} (89%) diff --git a/bin/console b/bin/console old mode 100755 new mode 100644 index 3e8d1c029..bec287c6f --- a/bin/console +++ b/bin/console @@ -4,12 +4,14 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\Console\Application; use PHPCensor\DatabaseManager; +use PHPCensor\StoreRegistry; error_reporting(-1); ini_set('display_errors', 1); /** @var $configuration ConfigurationInterface */ /** @var $databaseManager DatabaseManager */ +/** @var $storeRegistry StoreRegistry */ require_once(dirname(__DIR__) . '/bootstrap.php'); -(new Application($configuration, $databaseManager))->run(); +(new Application($configuration, $databaseManager, $storeRegistry))->run(); diff --git a/bootstrap.php b/bootstrap.php index 2d4509bcc..34dbee7cf 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -3,7 +3,7 @@ use PHPCensor\Configuration; use PHPCensor\DatabaseManager; use PHPCensor\Helper\Lang; -use PHPCensor\Store\Factory; +use PHPCensor\StoreRegistry; const ROOT_DIR = __DIR__ . '/'; const SRC_DIR = ROOT_DIR . 'src/'; @@ -16,9 +16,8 @@ $configurationPath = APP_DIR . 'config.yml'; $configuration = new Configuration($configurationPath); $databaseManager = new DatabaseManager($configuration); - -Factory::$databaseManager = $databaseManager; +$storeRegistry = new StoreRegistry($databaseManager); \define('APP_URL', $configuration->get('php-censor.url', '') . '/'); -Lang::init($configuration); +Lang::init($configuration, $storeRegistry); diff --git a/public/index.php b/public/index.php index 45c9c0d39..0822def82 100644 --- a/public/index.php +++ b/public/index.php @@ -2,12 +2,14 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; +use PHPCensor\StoreRegistry; \session_start(); /** @var $configuration ConfigurationInterface */ /** @var $databaseManager DatabaseManager */ +/** @var $storeRegistry StoreRegistry */ require_once(dirname(__DIR__) . '/bootstrap.php'); -$fc = new PHPCensor\Application($configuration, new PHPCensor\Http\Request()); +$fc = new PHPCensor\Application($configuration, $databaseManager, $storeRegistry, new PHPCensor\Http\Request()); print $fc->handleRequest(); diff --git a/src/Application.php b/src/Application.php index 2dbb7f26b..a7446ada4 100644 --- a/src/Application.php +++ b/src/Application.php @@ -9,7 +9,8 @@ use PHPCensor\Http\Response; use PHPCensor\Http\Response\RedirectResponse; use PHPCensor\Http\Router; -use PHPCensor\Store\Factory; +use PHPCensor\Model\User; +use PHPCensor\Store\UserStore; /** * @author Dan Cryer @@ -26,15 +27,19 @@ class Application private DatabaseManager $databaseManager; + private StoreRegistry $storeRegistry; + private Router $router; public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, ?Request $request = null ) { $this->configuration = $configuration; $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; $this->request = new Request(); if (!is_null($request)) { @@ -58,7 +63,7 @@ public function init() // Inlined as a closure to fix "using $this when not in object context" on 5.3 $validateSession = function () { if (!empty($_SESSION['php-censor-user-id'])) { - $user = Factory::getStore('User')->getByPrimaryKey($_SESSION['php-censor-user-id']); + $user = $this->storeRegistry->get('User')->getByPrimaryKey($_SESSION['php-censor-user-id']); if ($user) { return true; @@ -124,6 +129,23 @@ protected function handleRequestInner() return $this->getController()->handleAction($action, $this->route['args']); } + /** + * @return User|null + * + * @throws HttpException + */ + private function getUser() + { + if (empty($_SESSION['php-censor-user-id'])) { + return null; + } + + /** @var UserStore $userStore */ + $userStore = $this->storeRegistry->get('User'); + + return $userStore->getById($_SESSION['php-censor-user-id']); + } + /** * Handle an incoming web request. * @@ -136,6 +158,7 @@ public function handleRequest() } catch (HttpException $ex) { $view = new View('exception'); $view->exception = $ex; + $view->user = $this->getUser(); $response = new Response(); @@ -182,7 +205,7 @@ protected function shouldSkipAuth(): bool $defaultUserId = (int)$this->configuration->get('php-censor.security.default_user_id', 1); if ($disableAuth && $defaultUserId) { - $user = Factory::getStore('User')->getByPrimaryKey($defaultUserId); + $user = $this->storeRegistry->get('User')->getByPrimaryKey($defaultUserId); if ($user) { return true; diff --git a/src/BuildFactory.php b/src/BuildFactory.php index 67051e2a9..bf4e9d07c 100644 --- a/src/BuildFactory.php +++ b/src/BuildFactory.php @@ -4,7 +4,6 @@ use PHPCensor\Model\Build; use PHPCensor\Model\Project; -use PHPCensor\Store\Factory; /** * BuildFactory - Takes in a generic "Build" and returns a type-specific build model. @@ -15,27 +14,32 @@ class BuildFactory { /** * @param ConfigurationInterface $configuration + * @param StoreRegistry $storeRegistry * @param int $buildId * * @return Build|null * * @throws Exception\HttpException */ - public static function getBuildById(ConfigurationInterface $configuration, int $buildId): ?Build - { - $build = Factory::getStore('Build')->getById($buildId); + public static function getBuildById( + ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, + int $buildId + ): ?Build { + $build = $storeRegistry->get('Build')->getById($buildId); if (empty($build)) { return null; } - return self::getBuild($configuration, $build); + return self::getBuild($configuration, $storeRegistry, $build); } /** * Takes a generic build and returns a type-specific build model. * * @param ConfigurationInterface $configuration + * @param StoreRegistry $storeRegistry * @param Build $build * * @return Build @@ -44,6 +48,7 @@ public static function getBuildById(ConfigurationInterface $configuration, int $ */ public static function getBuild( ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, Build $build ): Build { $project = $build->getProject(); @@ -85,7 +90,12 @@ public static function getBuild( } $class = '\\PHPCensor\\Model\\Build\\' . $type; - $build = new $class($configuration, $build->getDataArray()); + + if ($class instanceof Build\GitBuild) { + $build = new $class($configuration, $storeRegistry, $build->getDataArray()); + } else { + $build = new $class($configuration, $build->getDataArray()); + } } return $build; diff --git a/src/Builder.php b/src/Builder.php index 623771e90..a9adfd32b 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -13,7 +13,6 @@ use PHPCensor\Plugin\Util\Factory as PluginFactory; use PHPCensor\Store\BuildErrorWriter; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -106,21 +105,33 @@ class Builder private DatabaseManager $databaseManager; + private StoreRegistry $storeRegistry; + public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, Build $build, LoggerInterface $logger = null ) { - $this->configuration = $configuration; + $this->configuration = $configuration; $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; - $this->build = $build; - $this->store = Factory::getStore('Build'); + $this->build = $build; + $this->store = $this->storeRegistry->get('Build'); $this->buildLogger = new BuildLogger($logger, $build); $pluginFactory = $this->buildPluginFactory($build); - $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger); + + /** @var BuildStore $buildStore */ + $buildStore = $this->storeRegistry->get('Build'); + $this->pluginExecutor = new Plugin\Util\Executor( + $this->storeRegistry, + $pluginFactory, + $this->buildLogger, + $buildStore + ); $executorClass = 'PHPCensor\Helper\CommandExecutor'; $this->commandExecutor = new $executorClass( @@ -129,10 +140,11 @@ public function __construct( $this->verbose ); - $this->interpolator = new BuildInterpolator(); + $this->interpolator = new BuildInterpolator($this->storeRegistry); $this->buildErrorWriter = new BuildErrorWriter( $this->configuration, $this->databaseManager, + $this->storeRegistry, $this->build->getProjectId(), $this->build->getId() ); diff --git a/src/Command/Action/CreateAdmin.php b/src/Command/Action/CreateAdmin.php index 0297b77cc..47fe91e94 100644 --- a/src/Command/Action/CreateAdmin.php +++ b/src/Command/Action/CreateAdmin.php @@ -8,6 +8,7 @@ use PHPCensor\Exception\RuntimeException; use PHPCensor\Service\UserService; use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -27,18 +28,22 @@ class CreateAdmin private OutputInterface $output; + private StoreRegistry $storeRegistry; + private UserStore $userStore; public function __construct( QuestionHelper $questionHelper, InputInterface $input, OutputInterface $output, + StoreRegistry $storeRegistry, UserStore $userStore ) { $this->questionHelper = $questionHelper; $this->input = $input; $this->output = $output; $this->userStore = $userStore; + $this->storeRegistry = $storeRegistry; } public function process(): array @@ -86,7 +91,7 @@ public function create(array $adminDetails): void throw new RuntimeException('Admin account already exists!'); } - $userService = new UserService($this->userStore); + $userService = new UserService($this->storeRegistry, $this->userStore); $userService->createUser( $adminDetails['name'], diff --git a/src/Command/Command.php b/src/Command/Command.php index 1e99f8a80..2fa8f5754 100644 --- a/src/Command/Command.php +++ b/src/Command/Command.php @@ -9,6 +9,7 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\Logging\OutputLogHandler; +use PHPCensor\StoreRegistry; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use Symfony\Component\Console\Input\InputInterface; @@ -27,11 +28,14 @@ abstract class Command extends BaseCommand protected DatabaseManager $databaseManager; + protected StoreRegistry $storeRegistry; + protected LoggerInterface $logger; public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, LoggerInterface $logger, ?string $name = null ) { @@ -39,6 +43,7 @@ public function __construct( $this->configuration = $configuration; $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; $this->logger = $logger; } diff --git a/src/Command/CreateAdminCommand.php b/src/Command/CreateAdminCommand.php index 14f2b2a40..5b8526df1 100644 --- a/src/Command/CreateAdminCommand.php +++ b/src/Command/CreateAdminCommand.php @@ -8,6 +8,7 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; @@ -28,11 +29,12 @@ class CreateAdminCommand extends Command public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, LoggerInterface $logger, UserStore $userStore, ?string $name = null ) { - parent::__construct($configuration, $databaseManager, $logger, $name); + parent::__construct($configuration, $databaseManager, $storeRegistry, $logger, $name); $this->userStore = $userStore; } @@ -58,6 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $questionHelper, $input, $output, + $this->storeRegistry, $this->userStore ); diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index 62903a350..36e18dad9 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -10,8 +10,8 @@ use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; use PHPCensor\Store; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; +use PHPCensor\StoreRegistry; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -34,12 +34,13 @@ class CreateBuildCommand extends Command public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, LoggerInterface $logger, ProjectStore $projectStore, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $databaseManager, $logger, $name); + parent::__construct($configuration, $databaseManager, $storeRegistry, $logger, $name); $this->projectStore = $projectStore; $this->buildService = $buildService; @@ -76,7 +77,7 @@ public function execute(InputInterface $input, OutputInterface $output) $environmentId = null; if ($environment) { /** @var Store\EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); + $environmentStore = $this->storeRegistry->get('Environment'); $environmentObject = $environmentStore->getByNameAndProjectId($environment, $project->getId()); if ($environmentObject) { $environmentId = $environmentObject->getId(); diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index d9bd0925f..a9ed36374 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -13,7 +13,6 @@ use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\ProjectGroup; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectGroupStore; use PHPCensor\Store\UserStore; use Symfony\Component\Console\Helper\QuestionHelper; @@ -233,7 +232,7 @@ private function getAdminInformation(InputInterface $input, OutputInterface $out $questionHelper = $this->getHelperSet()->get('question'); /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); + $userStore = $this->storeRegistry->get('User'); $createAdmin = new CreateAdmin( $questionHelper, @@ -596,7 +595,7 @@ protected function createAdminUser(array $admin, InputInterface $input, OutputIn $questionHelper = $this->getHelperSet()->get('question'); /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); + $userStore = $this->storeRegistry->get('User'); $createAdmin = new CreateAdmin( $questionHelper, @@ -615,18 +614,18 @@ protected function createDefaultGroup(OutputInterface $output): void { try { /** @var ProjectGroupStore $projectGroupStore */ - $projectGroupStore = Factory::getStore('ProjectGroup'); + $projectGroupStore = $this->storeRegistry->get('ProjectGroup'); $projectGroup = $projectGroupStore->getByTitle('Projects'); if ($projectGroup) { throw new RuntimeException('Default project group already exists!'); } - $group = new ProjectGroup(); + $group = new ProjectGroup($this->storeRegistry); $group->setTitle('Projects'); $group->setCreateDate(new DateTime()); $group->setUserId(null); - Factory::getStore('ProjectGroup')->save($group); + $this->storeRegistry->get('ProjectGroup')->save($group); $output->writeln('Default project group created!'); } catch (\Throwable $ex) { diff --git a/src/Command/RebuildQueueCommand.php b/src/Command/RebuildQueueCommand.php index 9c4caa571..a1dd63a32 100644 --- a/src/Command/RebuildQueueCommand.php +++ b/src/Command/RebuildQueueCommand.php @@ -8,7 +8,6 @@ use PHPCensor\Model\Project; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -32,16 +31,21 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { /** @var BuildStore $buildStore */ - $buildStore = Factory::getStore('Build'); + $buildStore = $this->storeRegistry->get('Build'); /** @var ProjectStore $projectStore */ - $projectStore = Factory::getStore('Project'); + $projectStore = $this->storeRegistry->get('Project'); $result = $buildStore->getByStatus(0); $this->logger->info(\sprintf('Found %d builds', \count($result['items']))); - $buildService = new BuildService($this->configuration, $buildStore, $projectStore); + $buildService = new BuildService( + $this->configuration, + $this->storeRegistry, + $buildStore, + $projectStore + ); while (\count($result['items'])) { $build = \array_shift($result['items']); diff --git a/src/Command/RemoveOldBuildsCommand.php b/src/Command/RemoveOldBuildsCommand.php index cbf4d337a..be59f44f1 100644 --- a/src/Command/RemoveOldBuildsCommand.php +++ b/src/Command/RemoveOldBuildsCommand.php @@ -8,6 +8,7 @@ use PHPCensor\DatabaseManager; use PHPCensor\Service\BuildService; use PHPCensor\Store\ProjectStore; +use PHPCensor\StoreRegistry; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -29,12 +30,13 @@ class RemoveOldBuildsCommand extends Command public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, LoggerInterface $logger, ProjectStore $projectStore, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $databaseManager, $logger, $name); + parent::__construct($configuration, $databaseManager, $storeRegistry, $logger, $name); $this->projectStore = $projectStore; $this->buildService = $buildService; diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 742774feb..de6b5ab45 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -5,13 +5,14 @@ namespace PHPCensor\Command; use Exception; +use Monolog\Logger; use Pheanstalk\Pheanstalk; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\Exception\RuntimeException; use PHPCensor\Service\BuildService; +use PHPCensor\StoreRegistry; use PHPCensor\Worker\BuildWorker; -use Psr\Log\LoggerInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -34,11 +35,12 @@ class WorkerCommand extends Command public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, - LoggerInterface $logger, + StoreRegistry $storeRegistry, + Logger $logger, BuildService $buildService, ?string $name = null ) { - parent::__construct($configuration, $databaseManager, $logger, $name); + parent::__construct($configuration, $databaseManager, $storeRegistry, $logger, $name); $this->buildService = $buildService; } @@ -101,6 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output) (new BuildWorker( $this->configuration, $this->databaseManager, + $this->storeRegistry, $this->logger, $this->buildService, $config['host'], diff --git a/src/Configuration.php b/src/Configuration.php index 9cab8a23a..8e1dea472 100644 --- a/src/Configuration.php +++ b/src/Configuration.php @@ -7,6 +7,12 @@ use PHPCensor\Common\ParameterBag; use Symfony\Component\Yaml\Parser as YamlParser; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Configuration extends ParameterBag implements ConfigurationInterface { /** diff --git a/src/ConfigurationInterface.php b/src/ConfigurationInterface.php index bb678f310..d67315ab2 100644 --- a/src/ConfigurationInterface.php +++ b/src/ConfigurationInterface.php @@ -6,6 +6,12 @@ use PHPCensor\Common\ParameterBagInterface; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ interface ConfigurationInterface extends ParameterBagInterface { } diff --git a/src/Console/Application.php b/src/Console/Application.php index a07c64b0d..e10693a1d 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -28,9 +28,9 @@ use PHPCensor\Logging\Handler; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; use Symfony\Component\Console\Application as BaseApplication; /** @@ -51,6 +51,12 @@ class Application extends BaseApplication LOGO; + private ConfigurationInterface $configuration; + + private DatabaseManager $databaseManager; + + private StoreRegistry $storeRegistry; + /** * @param ConfigurationInterface $applicationConfig * @@ -80,15 +86,16 @@ protected function initLogger(ConfigurationInterface $applicationConfig): Logger } /** - * @param ConfigurationInterface $applicationConfig + * @param ConfigurationInterface $configuration * @param string $name * @param string $version * * @throws Exception */ public function __construct( - ConfigurationInterface $applicationConfig, + ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, string $name = 'PHP Censor', string $version = 'UNKNOWN' ) { @@ -97,8 +104,12 @@ public function __construct( parent::__construct($name, $version); - $oldDatabaseSettings = $applicationConfig->get('b8.database', []); - $databaseSettings = $applicationConfig->get('php-censor.database', []); + $this->configuration = $configuration; + $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; + + $oldDatabaseSettings = $this->configuration->get('b8.database', []); + $databaseSettings = $this->configuration->get('php-censor.database', []); if ($oldDatabaseSettings && !$databaseSettings) { throw new InvalidArgumentException( 'Missing database settings in application config "config.yml" (Section: "php-censor.database")' @@ -170,24 +181,29 @@ public function __construct( ); /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); + $userStore = $this->storeRegistry->get('User'); /** @var ProjectStore $projectStore */ - $projectStore = Factory::getStore('Project'); + $projectStore = $this->storeRegistry->get('Project'); /** @var BuildStore $buildStore */ - $buildStore = Factory::getStore('Build'); - - $buildService = new BuildService($applicationConfig, $buildStore, $projectStore); - $logger = $this->initLogger($applicationConfig); - - $this->add(new InstallCommand($applicationConfig, $databaseManager, $logger)); - $this->add(new CreateAdminCommand($applicationConfig, $databaseManager, $logger, $userStore)); - $this->add(new CreateBuildCommand($applicationConfig, $databaseManager, $logger, $projectStore, $buildService)); - $this->add(new RemoveOldBuildsCommand($applicationConfig, $databaseManager, $logger, $projectStore, $buildService)); - $this->add(new WorkerCommand($applicationConfig, $databaseManager, $logger, $buildService)); - $this->add(new RebuildQueueCommand($applicationConfig, $databaseManager, $logger)); - $this->add(new CheckLocalizationCommand($applicationConfig, $databaseManager, $logger)); + $buildStore = $this->storeRegistry->get('Build'); + + $buildService = new BuildService( + $this->configuration, + $this->storeRegistry, + $buildStore, + $projectStore + ); + $logger = $this->initLogger($this->configuration); + + $this->add(new InstallCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); + $this->add(new CreateAdminCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $userStore)); + $this->add(new CreateBuildCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $projectStore, $buildService)); + $this->add(new RemoveOldBuildsCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $projectStore, $buildService)); + $this->add(new WorkerCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $buildService)); + $this->add(new RebuildQueueCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); + $this->add(new CheckLocalizationCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); } public function getHelp(): string diff --git a/src/Controller.php b/src/Controller.php index a24c37848..30e822c59 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -12,19 +12,18 @@ abstract class Controller */ protected Request $request; - /** - * @var ConfigurationInterface - */ protected ConfigurationInterface $configuration; - /** - * @param ConfigurationInterface $config - * @param Request $request - */ - public function __construct(ConfigurationInterface $config, Request $request) - { - $this->configuration = $config; - $this->request = $request; + protected StoreRegistry $storeRegistry; + + public function __construct( + ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, + Request $request + ) { + $this->configuration = $configuration; + $this->storeRegistry = $storeRegistry; + $this->request = $request; } /** diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 53c4c8865..71709de83 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -13,7 +13,6 @@ use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildErrorStore; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use PHPCensor\View; use PHPCensor\WebController; @@ -50,10 +49,15 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); - $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); + $this->buildService = new BuildService( + $this->configuration, + $this->storeRegistry, + $this->buildStore, + $this->projectStore + ); } /** @@ -76,7 +80,11 @@ public function view($buildId) $severity = null; } - $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); + $build = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$buildId + ); if (!$build) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); @@ -95,11 +103,12 @@ public function view($buildId) } /** @var BuildErrorStore $errorStore */ - $errorStore = Factory::getStore('BuildError'); + $errorStore = $this->storeRegistry->get('BuildError'); - $this->view->uiPlugins = $this->getUiPlugins(); - $this->view->build = $build; - $this->view->data = $data; + $this->view->uiPlugins = $this->getUiPlugins(); + $this->view->build = $build; + $this->view->data = $data; + $this->view->environment = $this->storeRegistry->get('Environment')->getById($build->getEnvironmentId()); $this->view->plugin = urldecode($plugin); $this->view->plugins = $errorStore->getKnownPlugins($buildId, $severity, $isNew); @@ -149,7 +158,7 @@ public function view($buildId) $delete = Lang::get('delete_build'); $deleteLink = APP_URL . 'build/delete/' . $build->getId(); - $project = Factory::getStore('Project')->getByPrimaryKey($build->getProjectId()); + $project = $this->storeRegistry->get('Project')->getByPrimaryKey($build->getProjectId()); $actions = ''; if (!$project->getArchived()) { @@ -220,7 +229,7 @@ protected function getBuildData(Build $build, $plugin, $severity, $isNew, $start $data['duration'] = $build->getDuration(); /** @var BuildErrorStore $errorStore */ - $errorStore = Factory::getStore('BuildError'); + $errorStore = $this->storeRegistry->get('BuildError'); $errors = $errorStore->getByBuildId($build->getId(), $perPage, $start, $plugin, $severity, $isNew); $errorView = new View('Build/errors'); @@ -285,8 +294,13 @@ protected function getPaginatorHtml($buildId, $plugin, $severity, $isNew, $total */ public function rebuild($buildId) { - $copy = BuildFactory::getBuildById($this->configuration, (int)$buildId); - $project = Factory::getStore('Project')->getByPrimaryKey($copy->getProjectId()); + $copy = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$buildId + ); + + $project = $this->storeRegistry->get('Project')->getByPrimaryKey($copy->getProjectId()); if (!$copy || $project->getArchived()) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); @@ -319,7 +333,11 @@ public function delete($buildId) { $this->requireAdmin(); - $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); + $build = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$buildId + ); if (!$build) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); @@ -381,7 +399,11 @@ public function ajaxData($buildId) } $response = new JsonResponse(); - $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); + $build = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$buildId + ); if (!$build) { $response->setResponseCode(404); @@ -416,7 +438,12 @@ public function ajaxData($buildId) public function ajaxMeta($buildId) { - $build = BuildFactory::getBuildById($this->configuration, (int)$buildId); + $build = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$buildId + ); + $key = $this->getParam('key', null); $numBuilds = $this->getParam('num_builds', 1); $data = null; diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 6900da021..e0fd8b604 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -13,7 +13,6 @@ use PHPCensor\Model\Project; use PHPCensor\Service\BuildStatusService; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use PHPCensor\WebController; use SimpleXMLElement; @@ -152,8 +151,8 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); } /** @@ -302,8 +301,9 @@ public function view($projectId) $this->view->latest = $builds[0]; } - $this->view->builds = $builds; - $this->view->project = $project; + $this->view->builds = $builds; + $this->view->project = $project; + $this->view->environmentStore = $this->storeRegistry->get('Environment'); return $this->view->render(); } diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php index 103130377..6d84479b5 100644 --- a/src/Controller/GroupController.php +++ b/src/Controller/GroupController.php @@ -8,7 +8,6 @@ use PHPCensor\Http\Response\RedirectResponse; use PHPCensor\Model\ProjectGroup; use PHPCensor\Model\User; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectGroupStore; use PHPCensor\WebController; @@ -33,7 +32,7 @@ public function init() { parent::init(); - $this->groupStore = Factory::getStore('ProjectGroup'); + $this->groupStore = $this->storeRegistry->get('ProjectGroup'); } /** @@ -51,8 +50,8 @@ public function index() 'title' => $group->getTitle(), 'id' => $group->getId(), ]; - $projectsActive = Factory::getStore('Project')->getByGroupId($group->getId(), false); - $projectsArchived = Factory::getStore('Project')->getByGroupId($group->getId(), true); + $projectsActive = $this->storeRegistry->get('Project')->getByGroupId($group->getId(), false); + $projectsArchived = $this->storeRegistry->get('Project')->getByGroupId($group->getId(), true); $thisGroup['projects'] = array_merge($projectsActive['items'], $projectsArchived['items']); $groups[] = $thisGroup; @@ -60,6 +59,7 @@ public function index() $this->layout->title = Lang::get('group_projects'); $this->view->groups = $groups; + $this->view->user = $this->getUser(); } /** @@ -76,7 +76,7 @@ public function edit($groupId = null) if (!is_null($groupId)) { $group = $this->groupStore->getById($groupId); } else { - $group = new ProjectGroup(); + $group = new ProjectGroup($this->storeRegistry); } if ($this->request->getMethod() == 'POST') { diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 045ace788..89bb5aeae 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -2,7 +2,6 @@ namespace PHPCensor\Controller; -use Exception; use JasonGrimes\Paginator; use PHPCensor; use PHPCensor\BuildFactory; @@ -16,7 +15,6 @@ use PHPCensor\Service\BuildService; use PHPCensor\Service\ProjectService; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use PHPCensor\View; use PHPCensor\WebController; @@ -63,10 +61,15 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); - $this->projectService = new ProjectService($this->projectStore); - $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); + $this->projectService = new ProjectService($this->storeRegistry, $this->projectStore); + $this->buildService = new BuildService( + $this->configuration, + $this->storeRegistry, + $this->buildStore, + $this->projectStore + ); } /** @@ -143,6 +146,7 @@ public function view($projectId) $perPage, $page ); + $this->view->user = $this->getUser(); $this->layout->title = $project->getTitle(); $this->layout->subtitle = ''; @@ -240,7 +244,7 @@ public function build($projectId) $environmentId = null; if ($environment) { /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); + $environmentStore = $this->storeRegistry->get('Environment'); $environmentObject = $environmentStore->getByNameAndProjectId($environment, $project->getId()); if ($environmentObject) { $environmentId = $environmentObject->getId(); @@ -347,7 +351,7 @@ protected function getLatestBuildsHtml($projectId, $branch = '', $environment = if (!empty($environment)) { /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); + $environmentStore = $this->storeRegistry->get('Environment'); $environmentObject = $environmentStore->getByNameAndProjectId($environment, $projectId); if ($environmentObject) { $criteria['environment_id'] = $environmentObject->getId(); @@ -366,7 +370,9 @@ protected function getLatestBuildsHtml($projectId, $branch = '', $environment = $build = BuildFactory::getBuild($this->configuration, $build); } - $view->builds = $builds['items']; + $view->builds = $builds['items']; + $view->environmentStore = $this->storeRegistry->get('Environment'); + $view->user = $this->getUser(); return [ $view->render(), @@ -612,9 +618,9 @@ protected function projectForm($values, $type = 'add') $field = Form\Element\Select::create('group_id', Lang::get('project_group'), true); $field->setClass('form-control')->setContainerClass('form-group')->setValue(null); - $groups = []; - $groupStore = Factory::getStore('ProjectGroup'); - $groupList = $groupStore->getWhere([], 100, 0, ['title' => 'ASC']); + $groups = []; + $groupStore = $this->storeRegistry->get('ProjectGroup'); + $groupList = $groupStore->getWhere([], 100, 0, ['title' => 'ASC']); foreach ($groupList['items'] as $group) { $groups[$group->getId()] = $group->getTitle(); diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index 89ef4fae3..5fac62638 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -13,7 +13,6 @@ use PHPCensor\Helper\Lang; use PHPCensor\Http\Response\RedirectResponse; use PHPCensor\Security\Authentication\Service; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; use PHPCensor\WebController; @@ -46,8 +45,8 @@ public function init() { parent::init(); - $this->userStore = Factory::getStore('User'); - $this->authentication = new Service($this->configuration); + $this->userStore = $this->storeRegistry->get('User'); + $this->authentication = new Service($this->configuration, $this->storeRegistry); } protected function loginForm($values) diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index cfdab5ced..5052f6b83 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -9,7 +9,6 @@ use PHPCensor\Http\Response\RedirectResponse; use PHPCensor\Model\User; use PHPCensor\Service\UserService; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; use PHPCensor\View; use PHPCensor\WebController; @@ -43,8 +42,8 @@ public function init() { parent::init(); - $this->userStore = Factory::getStore('User'); - $this->userService = new UserService($this->userStore); + $this->userStore = $this->storeRegistry->get('User'); + $this->userService = new UserService($this->storeRegistry, $this->userStore); } /** @@ -52,9 +51,11 @@ public function init() */ public function index() { - $users = $this->userStore->getWhere([], 1000, 0, ['email' => 'ASC']); - $this->view->users = $users; - $this->layout->title = Lang::get('manage_users'); + $users = $this->userStore->getWhere([], 1000, 0, ['email' => 'ASC']); + $this->view->currentUser = $this->getUser(); + $this->view->users = $users; + + $this->layout->title = Lang::get('manage_users'); return $this->view->render(); } diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index a78265a86..fcacfcf11 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -19,7 +19,6 @@ use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; /** @@ -53,10 +52,15 @@ class WebhookController extends Controller */ public function init() { - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); - - $this->buildService = new BuildService($this->configuration, $this->buildStore, $this->projectStore); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); + + $this->buildService = new BuildService( + $this->configuration, + $this->storeRegistry, + $this->buildStore, + $this->projectStore + ); } /** @@ -141,7 +145,7 @@ protected function createBuild( $createdBuilds = []; /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); + $environmentStore = $this->storeRegistry->get('Environment'); $environmentObject = $environmentStore->getByNameAndProjectId($environment, $project->getId()); if ($environment && $environmentObject) { if ( @@ -1073,7 +1077,7 @@ protected function gogsPullRequest(Project $project, array $payload) $envsUpdated = []; $envObjects = $project->getEnvironmentsObjects(); - $store = Factory::getStore('Environment'); + $store = $this->storeRegistry->get('Environment'); foreach ($envObjects['items'] as $environment) { $branches = $environment->getBranches(); if (in_array($environment->getName(), $envs)) { diff --git a/src/Controller/WidgetAllProjectsController.php b/src/Controller/WidgetAllProjectsController.php index b805fb5f3..4d74838c0 100644 --- a/src/Controller/WidgetAllProjectsController.php +++ b/src/Controller/WidgetAllProjectsController.php @@ -8,7 +8,6 @@ use PHPCensor\Model\Build; use PHPCensor\Model\Project; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectGroupStore; use PHPCensor\Store\ProjectStore; use PHPCensor\View; @@ -41,9 +40,9 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); - $this->groupStore = Factory::getStore('ProjectGroup'); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); + $this->groupStore = $this->storeRegistry->get('ProjectGroup'); } /** diff --git a/src/Controller/WidgetBuildErrorsController.php b/src/Controller/WidgetBuildErrorsController.php index c3edc7bd6..768af50d6 100644 --- a/src/Controller/WidgetBuildErrorsController.php +++ b/src/Controller/WidgetBuildErrorsController.php @@ -5,7 +5,6 @@ use PHPCensor\Exception\HttpException; use PHPCensor\Http\Response; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use PHPCensor\View; use PHPCensor\WebController; @@ -32,8 +31,8 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); - $this->projectStore = Factory::getStore('Project'); + $this->buildStore = $this->storeRegistry->get('Build'); + $this->projectStore = $this->storeRegistry->get('Project'); } /** diff --git a/src/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php index 94119b892..9c2346fed 100644 --- a/src/Controller/WidgetLastBuildsController.php +++ b/src/Controller/WidgetLastBuildsController.php @@ -5,7 +5,6 @@ use PHPCensor\BuildFactory; use PHPCensor\Http\Response; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; use PHPCensor\View; use PHPCensor\WebController; @@ -26,7 +25,7 @@ public function init() { parent::init(); - $this->buildStore = Factory::getStore('Build'); + $this->buildStore = $this->storeRegistry->get('Build'); } /** @@ -62,7 +61,8 @@ public function update() $build = BuildFactory::getBuild($this->configuration, $build); } - $this->view->builds = $builds; + $this->view->builds = $builds; + $this->view->environmentStore = $this->storeRegistry->get('Environment'); $response = new Response(); $response->setContent($this->view->render()); diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php index aa8dd4b35..c014f78ce 100644 --- a/src/DatabaseConnection.php +++ b/src/DatabaseConnection.php @@ -4,6 +4,12 @@ namespace PHPCensor; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class DatabaseConnection { private \PDO $pdoConnection; diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index b98d51f95..5bbe43d70 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -7,6 +7,12 @@ use PHPCensor\Common\Exception\Exception; use PHPCensor\Exception\RuntimeException; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class DatabaseManager { const MYSQL_TYPE = 'mysql'; @@ -93,12 +99,4 @@ public function getConnection(string $type = 'read'): DatabaseConnection return $this->connections[$type]; } - - public function resetConnections(): void - { - $this->connections = [ - 'read' => null, - 'write' => null - ]; - } } diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php deleted file mode 100644 index 724713fd2..000000000 --- a/src/Exception/RuntimeException.php +++ /dev/null @@ -1,17 +0,0 @@ - - */ -class RuntimeException extends Exception -{ -} diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index 3d817f9eb..e932e3bc7 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -5,7 +5,7 @@ use Exception; use PHPCensor\Model\Build as BaseBuild; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; +use PHPCensor\StoreRegistry; /** * The BuildInterpolator class replaces variables in a string with build-specific information. @@ -20,7 +20,14 @@ class BuildInterpolator * * @see setupInterpolationVars() */ - protected $interpolationVars = []; + private array $interpolationVars = []; + + private StoreRegistry $storeRegistry; + + public function __construct(StoreRegistry $storeRegistry) + { + $this->storeRegistry = $storeRegistry; + } /** * Sets the variables that will be used for interpolation. @@ -53,7 +60,7 @@ public function setupInterpolationVars(BaseBuild $build, $url, $applicationVersi $environment = null; if ($environmentId) { /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); + $environmentStore = $this->storeRegistry->get('Environment'); $environmentObject = $environmentStore->getById($environmentId); if ($environmentObject) { $environment = $environmentObject->getName(); diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index e45d19fd0..4c8e218a2 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -3,8 +3,8 @@ namespace PHPCensor\Helper; use PHPCensor\ConfigurationInterface; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; /** * Languages Helper Class - Handles loading strings files and the strings within them. @@ -112,12 +112,12 @@ public static function getStrings() /** * Initialise the Language helper, try load the language file for the user's browser or the configured default. - * - * @param ConfigurationInterface $config - * @param string $languageForce */ - public static function init(ConfigurationInterface $config, $languageForce = null) - { + public static function init( + ConfigurationInterface $config, + StoreRegistry $storeRegistry, + ?string $languageForce = null + ) { self::$defaultStrings = self::loadLanguage(self::DEFAULT_LANGUAGE); self::loadAvailableLanguages(); @@ -128,7 +128,7 @@ public static function init(ConfigurationInterface $config, $languageForce = nul $user = null; if (!empty($_SESSION['php-censor-user-id'])) { /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); + $userStore = $storeRegistry->get('User'); $user = $userStore->getById($_SESSION['php-censor-user-id']); } diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index 5c8a06cf8..6c01b7311 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -3,8 +3,9 @@ namespace PHPCensor\Logging; use Monolog\Handler\AbstractProcessingHandler; +use Monolog\Logger; use PHPCensor\Model\Build; -use PHPCensor\Store\Factory; +use PHPCensor\Store\BuildStore; use Psr\Log\LogLevel; /** @@ -15,7 +16,9 @@ class BuildDBLogHandler extends AbstractProcessingHandler /** * @var Build */ - protected $build; + protected Build $build; + + protected BuildStore $buildStore; protected $logValue; @@ -29,18 +32,17 @@ class BuildDBLogHandler extends AbstractProcessingHandler */ protected $flushDelay = 1; - /** - * @param Build $build - * @param bool $level - * @param bool $bubble - */ public function __construct( + BuildStore $buildStore, Build $build, - $level = LogLevel::INFO, - $bubble = true + $level = Logger::INFO, + bool $bubble = true ) { parent::__construct($level, $bubble); - $this->build = $build; + + $this->build = $build; + $this->buildStore = $buildStore; + // We want to add to any existing saved log information. $this->logValue = $build->getLog(); } @@ -59,7 +61,7 @@ public function __destruct() protected function flushData() { $this->build->setLog($this->logValue); - Factory::getStore('Build')->save($this->build); + $this->buildStore->save($this->build); $this->flushTimestamp = time(); } diff --git a/src/Model.php b/src/Model.php index e362f8b66..3f9eb3a66 100644 --- a/src/Model.php +++ b/src/Model.php @@ -6,51 +6,37 @@ class Model { - /** - * @var array - */ - protected $data = []; - - /** - * @var array - */ - protected $modified = []; - - /** - * @param array $initialData - */ - public function __construct(array $initialData = []) - { - if (is_array($initialData)) { + protected array $data = []; + + protected array $modified = []; + + protected StoreRegistry $storeRegistry; + + public function __construct( + StoreRegistry $storeRegistry, + array $initialData = [] + ) { + if (\is_array($initialData)) { foreach ($initialData as $index => $item) { - if (array_key_exists($index, $this->data)) { + if (\array_key_exists($index, $this->data)) { $this->data[$index] = $item; } } } + + $this->storeRegistry = $storeRegistry; } - /** - * @return array - */ public function getDataArray(): array { return $this->data; } - /** - * @return array - */ public function getModified(): array { return $this->modified; } - /** - * @param string $column - * - * @return bool - */ protected function setModified(string $column): bool { $this->modified[$column] = $column; diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 55520908d..c09254d13 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -9,7 +9,6 @@ use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; class Build extends Model { @@ -33,7 +32,7 @@ class Build extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'parent_id' => null, 'project_id' => null, @@ -591,7 +590,7 @@ public function getErrorsTotal() if (null === $this->data['errors_total'] && !in_array($this->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true)) { /** @var BuildStore $store */ - $store = Factory::getStore('Build'); + $store = $this->storeRegistry->get('Build'); $this->setErrorsTotal($store->getErrorsCount($this->getId())); $store->save($this); @@ -625,7 +624,7 @@ public function getErrorsTotalPrevious() { if (null === $this->data['errors_total_previous']) { /** @var BuildStore $store */ - $store = Factory::getStore('Build'); + $store = $this->storeRegistry->get('Build'); $trend = $store->getBuildErrorsTrend($this->getId(), $this->getProjectId(), $this->getBranch()); @@ -671,7 +670,7 @@ public function getErrorsNew() { if (null === $this->data['errors_new']) { /** @var BuildStore $errorStore */ - $store = Factory::getStore('Build'); + $store = $this->storeRegistry->get('Build'); $this->setErrorsNew( (int)$store->getNewErrorsCount($this->getId()) diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index 3a2b2d7f2..ba1c0a99b 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -18,7 +18,7 @@ class BuildError extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'build_id' => null, 'plugin' => null, diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 4541e9c75..84c403a67 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -11,7 +11,7 @@ class BuildMeta extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'build_id' => null, 'meta_key' => null, diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index bed6aff13..ef5e9c03b 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -11,7 +11,7 @@ class Environment extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'project_id' => null, 'name' => null, diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 242d02e2c..668b22326 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -30,7 +30,7 @@ class Project extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'title' => null, 'reference' => null, diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index b2670f676..7a58f04ab 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -13,7 +13,7 @@ class ProjectGroup extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'title' => null, 'create_date' => null, diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index c10aaaf57..d3981ca2a 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -11,7 +11,7 @@ class User extends Model /** * @var array */ - protected $data = [ + protected array $data = [ 'id' => null, 'email' => null, 'hash' => null, diff --git a/src/Model/Build.php b/src/Model/Build.php index 4fb8d260b..add7fba52 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -12,7 +12,6 @@ use PHPCensor\Model\Base\Build as BaseBuild; use PHPCensor\Plugin\PhpParallelLint; use PHPCensor\Store\BuildErrorStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; use ReflectionClass; use ReflectionException; @@ -82,7 +81,7 @@ public function getProject() } /** @var ProjectStore $projectStore */ - $projectStore = Factory::getStore('Project'); + $projectStore = $this->storeRegistry->get('Project'); return $projectStore->getById($projectId); } @@ -122,7 +121,7 @@ public function removeExtraValue($name) */ public function getBuildBuildErrors() { - return Factory::getStore('BuildError')->getByBuildId($this->getId()); + return $this->storeRegistry->get('BuildError')->getByBuildId($this->getId()); } /** @@ -132,7 +131,7 @@ public function getBuildBuildErrors() */ public function getBuildBuildMetas() { - return Factory::getStore('BuildMeta')->getByBuildId($this->getId()); + return $this->storeRegistry->get('BuildMeta')->getByBuildId($this->getId()); } /** @@ -214,7 +213,7 @@ public function storeMeta($key, $value) { $value = json_encode($value); - Factory::getStore('Build')->setMeta($this->getId(), $key, $value); + $this->storeRegistry->get('Build')->setMeta($this->getId(), $key, $value); } /** @@ -656,7 +655,7 @@ public function getTotalErrorsCount($plugin = null, $severity = null, $isNew = n if (!isset($this->totalErrorsCount[$key])) { /** @var BuildErrorStore $store */ - $store = Factory::getStore('BuildError'); + $store = $this->storeRegistry->get('BuildError'); $this->totalErrorsCount[$key] = (int)$store->getErrorTotalForBuild( $this->getId(), diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 10a19c9fb..a6c99f1cc 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -6,6 +6,7 @@ use PHPCensor\Builder; use PHPCensor\ConfigurationInterface; use PHPCensor\Model\Build; +use PHPCensor\StoreRegistry; use Psr\Log\LogLevel; /** @@ -19,9 +20,10 @@ class GitBuild extends Build public function __construct( ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, array $initialData = [] ) { - parent::__construct($initialData); + parent::__construct($storeRegistry, $initialData); $this->configuration = $configuration; } diff --git a/src/Model/BuildError.php b/src/Model/BuildError.php index 63c5ed892..cfc5411ef 100644 --- a/src/Model/BuildError.php +++ b/src/Model/BuildError.php @@ -4,7 +4,6 @@ use PHPCensor\Model\Base\BuildError as BaseBuildError; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; class BuildError extends BaseBuildError { @@ -19,7 +18,7 @@ public function getBuild() } /** @var BuildStore $buildStore */ - $buildStore = Factory::getStore('Build'); + $buildStore = $this->storeRegistry->get('Build'); return $buildStore->getById($buildId); } diff --git a/src/Model/BuildMeta.php b/src/Model/BuildMeta.php index b6e09dd78..1f69edd12 100644 --- a/src/Model/BuildMeta.php +++ b/src/Model/BuildMeta.php @@ -4,7 +4,6 @@ use PHPCensor\Model\Base\BuildMeta as BaseBuildMeta; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; class BuildMeta extends BaseBuildMeta { @@ -19,7 +18,7 @@ public function getBuild() } /** @var BuildStore $buildStore */ - $buildStore = Factory::getStore('Build'); + $buildStore = $this->storeRegistry->get('Build'); return $buildStore->getById($buildId); } diff --git a/src/Model/Project.php b/src/Model/Project.php index 51c3f6950..92fbe2ade 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -4,7 +4,6 @@ use PHPCensor\Model\Base\Project as BaseProject; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectGroupStore; use Symfony\Component\Yaml\Dumper as YamlDumper; use Symfony\Component\Yaml\Parser as YamlParser; @@ -25,7 +24,7 @@ public function getGroup() } /** @var ProjectGroupStore $groupStore */ - $groupStore = Factory::getStore('ProjectGroup'); + $groupStore = $this->storeRegistry->get('ProjectGroup'); return $groupStore->getById($groupId); } @@ -37,7 +36,7 @@ public function getGroup() */ public function getProjectBuilds() { - return Factory::getStore('Build')->getByProjectId($this->getId()); + return $this->storeRegistry->get('Build')->getByProjectId($this->getId()); } /** @@ -60,7 +59,7 @@ public function getLatestBuild($branch, $status = null) } $order = ['id' => 'DESC']; - $builds = Factory::getStore('Build')->getWhere($criteria, 1, 0, $order); + $builds = $this->storeRegistry->get('Build')->getWhere($criteria, 1, 0, $order); if (is_array($builds['items']) && count($builds['items'])) { $latest = array_shift($builds['items']); @@ -87,7 +86,7 @@ public function getPreviousBuild($branch) 'project_id' => $this->getId() ]; $order = ['id' => 'DESC']; - $builds = Factory::getStore('Build')->getWhere($criteria, 1, 1, $order); + $builds = $this->storeRegistry->get('Build')->getWhere($criteria, 1, 1, $order); if (is_array($builds['items']) && count($builds['items'])) { $previous = array_shift($builds['items']); @@ -137,7 +136,7 @@ public function getIcon() protected function getEnvironmentStore() { /** @var EnvironmentStore $store */ - $store = Factory::getStore('Environment'); + $store = $this->storeRegistry->get('Environment'); return $store; } @@ -223,7 +222,7 @@ public function setEnvironments($value) if (!empty($environmentsNames)) { // add foreach ($environmentsNames as $environmentName) { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); $environment->setProjectId($this->getId()); $environment->setName($environmentName); $environment->setBranches(!empty($environmentsConfig[$environment->getName()]) ? $environmentsConfig[$environment->getName()] : []); diff --git a/src/Model/ProjectGroup.php b/src/Model/ProjectGroup.php index 14b6cf707..e1f21ae88 100644 --- a/src/Model/ProjectGroup.php +++ b/src/Model/ProjectGroup.php @@ -3,7 +3,6 @@ namespace PHPCensor\Model; use PHPCensor\Model\Base\ProjectGroup as BaseProjectGroup; -use PHPCensor\Store\Factory; use PHPCensor\Store\ProjectStore; class ProjectGroup extends BaseProjectGroup @@ -14,7 +13,7 @@ class ProjectGroup extends BaseProjectGroup public function getGroupProjects() { /** @var ProjectStore $projectStore */ - $projectStore = Factory::getStore('Project'); + $projectStore = $this->storeRegistry->get('Project'); return $projectStore->getByGroupId($this->getId(), false); } diff --git a/src/Plugin.php b/src/Plugin.php index d86500612..f778587ac 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -73,6 +73,8 @@ abstract class Plugin */ protected $binaryName = []; + protected ?StoreRegistry $storeRegistry = null; + /** * @param Builder $builder * @param Build $build @@ -297,4 +299,9 @@ public static function pluginName() { return ''; } + + public function setStoreRegistry(StoreRegistry $storeRegistry) + { + $this->storeRegistry = $storeRegistry; + } } diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index f60110d3e..b70bdf4a2 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -12,7 +12,6 @@ use PHPCensor\Store\BuildErrorStore; use PHPCensor\Store\BuildMetaStore; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory; class BitbucketNotify extends Plugin { @@ -249,7 +248,7 @@ protected function updateBuild() protected function prepareResult($targetBranch) { /** @var BuildErrorStore $buildErrorStore */ - $buildErrorStore = Factory::getStore('BuildError'); + $buildErrorStore = $this->storeRegistry->get('BuildError'); $targetBranchBuildStats = $buildErrorStore->getErrorAmountPerPluginForBuild( $this->findLatestBuild($targetBranch) @@ -285,8 +284,8 @@ protected function prepareResult($targetBranch) public function getPhpUnitCoverage($targetBranch) { /** @var BuildMetaStore $buildMetaStore */ - $buildMetaStore = Factory::getStore('BuildMeta'); - $latestTargeBuildId = $this->findLatestBuild($targetBranch); + $buildMetaStore = $this->storeRegistry->get('BuildMeta'); + $latestTargetBuildId = $this->findLatestBuild($targetBranch); $latestCurrentBuildId = $this->findLatestBuild($this->build->getBranch()); $targetMetaData = $buildMetaStore->getByKey( @@ -299,7 +298,7 @@ public function getPhpUnitCoverage($targetBranch) ); $targetBranchCoverage = []; - if (!is_null($latestTargeBuildId) && !is_null($targetMetaData)) { + if (!is_null($latestTargetBuildId) && !is_null($targetMetaData)) { $targetBranchCoverage = json_decode($targetMetaData->getMetaValue(), true); } @@ -354,7 +353,7 @@ protected function reportGenerator(array $stats) protected function findLatestBuild($branchName) { /** @var BuildStore $buildStore */ - $buildStore = Factory::getStore('Build'); + $buildStore = $this->storeRegistry->get('Build'); $build = $buildStore->getLatestBuildByProjectAndBranch($this->getBuild()->getProjectId(), $branchName); diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index aef238a74..17e16ba49 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -9,7 +9,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Store\BuildStore; -use PHPCensor\Store\Factory as StoreFactory; +use PHPCensor\StoreRegistry; /** * Plugin Executor - Runs the configured plugins for a given build stage. @@ -31,15 +31,18 @@ class Executor */ protected $store; - /** - * @param Factory $pluginFactory - * @param BuildLogger $logger - */ - public function __construct(Factory $pluginFactory, BuildLogger $logger, BuildStore $store = null) - { + protected StoreRegistry $storeRegistry; + + public function __construct( + StoreRegistry $storeRegistry, + Factory $pluginFactory, + BuildLogger $logger, + BuildStore $store = null + ) { + $this->storeRegistry = $storeRegistry; $this->pluginFactory = $pluginFactory; - $this->logger = $logger; - $this->store = $store ?: StoreFactory::getStore('Build'); + $this->logger = $logger; + $this->store = $store; } /** @@ -228,6 +231,7 @@ public function executePlugin($plugin, $options) try { // Build and run it $obj = $this->pluginFactory->buildPlugin($class, (is_null($options) ? [] : $options)); + $obj->setStoreRegistry($this->storeRegistry); return $obj->execute(); } catch (Exception $ex) { diff --git a/src/Security/Authentication/Service.php b/src/Security/Authentication/Service.php index cd3cca102..9f225d8e6 100644 --- a/src/Security/Authentication/Service.php +++ b/src/Security/Authentication/Service.php @@ -2,8 +2,8 @@ namespace PHPCensor\Security\Authentication; -use PHPCensor\Configuration; use PHPCensor\ConfigurationInterface; +use PHPCensor\StoreRegistry; /** * Authentication facade. @@ -19,8 +19,11 @@ class Service */ private array $providers; - public function __construct(ConfigurationInterface $configuration, array $providers = []) - { + public function __construct( + ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, + array $providers = [] + ) { if (!$providers) { $config = $configuration->get( 'php-censor.security.auth_providers', @@ -33,29 +36,21 @@ public function __construct(ConfigurationInterface $configuration, array $provid $providers = []; foreach ($config as $key => $providerConfig) { - $providers[$key] = self::buildProvider($key, $providerConfig); + $providers[$key] = self::buildProvider($storeRegistry, $key, $providerConfig); } } $this->providers = $providers; } - /** - * Create a provider from a given configuration. - * - * @param string $key - * @param string|array $config - * - * @return UserProviderInterface - */ - public static function buildProvider($key, $config) + public static function buildProvider(StoreRegistry $storeRegistry, string $key, array $config): UserProviderInterface { $class = ucfirst($config['type']); if (class_exists('\\PHPCensor\\Security\\Authentication\\UserProvider\\' . $class)) { $class = '\\PHPCensor\\Security\\Authentication\\UserProvider\\' . $class; } - return new $class($key, $config); + return new $class($storeRegistry, $key, $config); } /** diff --git a/src/Security/Authentication/UserProvider/AbstractProvider.php b/src/Security/Authentication/UserProvider/AbstractProvider.php index 77bd7a60e..c2e1f571f 100644 --- a/src/Security/Authentication/UserProvider/AbstractProvider.php +++ b/src/Security/Authentication/UserProvider/AbstractProvider.php @@ -3,6 +3,7 @@ namespace PHPCensor\Security\Authentication\UserProvider; use PHPCensor\Security\Authentication\UserProviderInterface; +use PHPCensor\StoreRegistry; /** * Abstract user provider. @@ -21,16 +22,16 @@ abstract class AbstractProvider implements UserProviderInterface */ protected array $config; - /** - * AbstractProvider constructor - * - * @param string $key - * @param array $config - */ - public function __construct(string $key, array $config) - { - $this->key = $key; - $this->config = $config; + protected StoreRegistry $storeRegistry; + + public function __construct( + StoreRegistry $storeRegistry, + string $key, + array $config + ) { + $this->key = $key; + $this->config = $config; + $this->storeRegistry = $storeRegistry; } /** diff --git a/src/Security/Authentication/UserProvider/Ldap.php b/src/Security/Authentication/UserProvider/Ldap.php index a76ac4ff0..72af93401 100644 --- a/src/Security/Authentication/UserProvider/Ldap.php +++ b/src/Security/Authentication/UserProvider/Ldap.php @@ -5,7 +5,6 @@ use PHPCensor\Model\User; use PHPCensor\Security\Authentication\LoginPasswordProviderInterface; use PHPCensor\Service\UserService; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; /** @@ -73,8 +72,8 @@ public function checkRequirements() public function provisionUser(?string $identifier): ?User { /** @var UserStore $user */ - $user = Factory::getStore('User'); - $userService = new UserService($user); + $user = $this->storeRegistry->get('User'); + $userService = new UserService($this->storeRegistry, $user); $parts = explode("@", $identifier); $username = $parts[0]; diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 1a477f423..17e05c194 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -15,6 +15,7 @@ use PHPCensor\Model\Project; use PHPCensor\Store\BuildStore; use PHPCensor\Store\ProjectStore; +use PHPCensor\StoreRegistry; use PHPCensor\Worker\BuildWorker; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Yaml\Exception\ParseException; @@ -31,14 +32,18 @@ class BuildService private ConfigurationInterface $configuration; + private StoreRegistry $storeRegistry; + public bool $queueError = false; public function __construct( ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, BuildStore $buildStore, ProjectStore $projectStore ) { $this->configuration = $configuration; + $this->storeRegistry = $storeRegistry; $this->buildStore = $buildStore; $this->projectStore = $projectStore; } @@ -69,7 +74,7 @@ public function createBuild( $userId = null, $extra = null ) { - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setCreateDate(new DateTime()); $build->setProjectId($project->getId()); $build->setStatusPending(); @@ -244,7 +249,7 @@ public function createPeriodicalBuilds(Logger $logger) */ public function createDuplicateBuild(Build $originalBuild, $source) { - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setParentId($originalBuild->getId()); $build->setProjectId($originalBuild->getProjectId()); $build->setCommitId($originalBuild->getCommitId()); diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index 4d1602025..4a48f3773 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -6,6 +6,7 @@ use Exception; use PHPCensor\Model\Project; use PHPCensor\Store\ProjectStore; +use PHPCensor\StoreRegistry; use Symfony\Component\Filesystem\Filesystem; /** @@ -13,17 +14,16 @@ */ class ProjectService { - /** - * @var ProjectStore - */ - protected $projectStore; + private ProjectStore $projectStore; - /** - * @param ProjectStore $projectStore - */ - public function __construct(ProjectStore $projectStore) - { - $this->projectStore = $projectStore; + private StoreRegistry $storeRegistry; + + public function __construct( + StoreRegistry $storeRegistry, + ProjectStore $projectStore + ) { + $this->storeRegistry = $storeRegistry; + $this->projectStore = $projectStore; } /** @@ -40,7 +40,7 @@ public function __construct(ProjectStore $projectStore) public function createProject($title, $type, $reference, $userId, $options = []) { // Create base project and use updateProject() to set its properties: - $project = new Project(); + $project = new Project($this->storeRegistry); $project->setCreateDate(new DateTime()); $project->setUserId((int)$userId); diff --git a/src/Service/UserService.php b/src/Service/UserService.php index 48a88c076..8c473e14a 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -4,23 +4,23 @@ use PHPCensor\Model\User; use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; /** * The user service handles the creation, modification and deletion of users. */ class UserService { - /** - * @var UserStore - */ - protected $store; + protected UserStore $store; - /** - * @param UserStore $store - */ - public function __construct(UserStore $store) - { - $this->store = $store; + protected StoreRegistry $storeRegistry; + + public function __construct( + StoreRegistry $storeRegistry, + UserStore $store + ) { + $this->storeRegistry = $storeRegistry; + $this->store = $store; } /** @@ -37,10 +37,10 @@ public function __construct(UserStore $store) */ public function createUser($name, $email, $providerKey, $providerData, $password, $isAdmin = false) { - $user = new User(); + $user = new User($this->storeRegistry); $user->setName($name); $user->setEmail($email); - $user->setHash(password_hash($password, PASSWORD_DEFAULT)); + $user->setHash(\password_hash($password, PASSWORD_DEFAULT)); $user->setProviderKey($providerKey); $user->setProviderData($providerData); $user->setIsAdmin($isAdmin); diff --git a/src/Store.php b/src/Store.php index a9eb41118..074b2625f 100644 --- a/src/Store.php +++ b/src/Store.php @@ -26,18 +26,23 @@ abstract class Store protected DatabaseManager $databaseManager; + protected StoreRegistry $storeRegistry; + abstract public function getByPrimaryKey($key, $useConnection = 'read'); /** * @throws RuntimeException */ - public function __construct(DatabaseManager $databaseManager) - { + public function __construct( + DatabaseManager $databaseManager, + StoreRegistry $storeRegistry + ) { if (empty($this->primaryKey)) { throw new RuntimeException('Save not implemented for this store.'); } $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; } /** diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 8a51704fa..870c6658a 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -60,7 +60,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new BuildError($data); + return new BuildError($this->storeRegistry, $data); } } @@ -127,7 +127,7 @@ public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = nul $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new BuildError($item); + return new BuildError($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index 812787ee4..cca7cb411 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -8,6 +8,7 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\Model\BuildError; +use PHPCensor\StoreRegistry; /** * Class BuildErrorWriter @@ -31,6 +32,8 @@ class BuildErrorWriter private DatabaseManager $databaseManager; + private StoreRegistry $storeRegistry; + /** * @see https://stackoverflow.com/questions/40361164/pdoexception-sqlstatehy000-general-error-7-number-of-parameters-must-be-bet */ @@ -39,6 +42,7 @@ class BuildErrorWriter public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, int $projectId, int $buildId ) { @@ -48,6 +52,7 @@ public function __construct( $this->buildId = $buildId; $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; } /** @@ -83,7 +88,7 @@ public function write( } /** @var BuildErrorStore $errorStore */ - $errorStore = Factory::getStore('BuildError'); + $errorStore = $this->storeRegistry->get('BuildError'); $hash = BuildError::generateHash($plugin, $file, $lineStart, $lineEnd, $severity, $message); $this->errors[] = [ diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index ca37a2045..351faab9a 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -59,7 +59,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new BuildMeta($data); + return new BuildMeta($this->storeRegistry, $data); } } @@ -91,7 +91,7 @@ public function getByKey($buildId, $key) if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new BuildMeta($data); + return new BuildMeta($this->storeRegistry, $data); } } @@ -124,7 +124,7 @@ public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new BuildMeta($item); + return new BuildMeta($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -157,7 +157,7 @@ public function getErrorsForUpgrade($limit) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new BuildMeta($item); + return new BuildMeta($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index b0efb9a41..593abc8dd 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -64,7 +64,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Build($data); + return new Build($this->storeRegistry, $data); } } @@ -97,7 +97,7 @@ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -135,7 +135,7 @@ public function getByStatus($status, $limit = 1000, $useConnection = 'read') $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -165,7 +165,7 @@ public function getBuilds($limit = 5, $offset = 0) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -192,7 +192,7 @@ public function getLatestBuildByProjectAndBranch($projectId, $branch) $stmt->bindValue(':branch', $branch); if ($stmt->execute() && $data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Build($data); + return new Build($this->storeRegistry, $data); } return null; @@ -228,7 +228,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -255,7 +255,7 @@ public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_ if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Build($data); + return new Build($this->storeRegistry, $data); } } else { return []; @@ -315,24 +315,24 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) } $build = null; if (count($projects[$projectId][$environment]['latest']) < $limitByProject) { - $build = new Build($item); + $build = new Build($this->storeRegistry, $item); $projects[$projectId][$environment]['latest'][] = $build; } if (count($latest) < $limitAll) { if (is_null($build)) { - $build = new Build($item); + $build = new Build($this->storeRegistry, $item); } $latest[] = $build; } if (empty($projects[$projectId][$environment]['success']) && Build::STATUS_SUCCESS === $item['status']) { if (is_null($build)) { - $build = new Build($item); + $build = new Build($this->storeRegistry, $item); } $projects[$projectId][$environment]['success'] = $build; } if (empty($projects[$projectId][$environment]['failed']) && Build::STATUS_FAILED === $item['status']) { if (is_null($build)) { - $build = new Build($item); + $build = new Build($this->storeRegistry, $item); } $projects[$projectId][$environment]['failed'] = $build; } @@ -372,7 +372,7 @@ public function getByProjectAndCommit($projectId, $commitId) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -453,7 +453,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR $rtn = $stmt->fetchAll(PDO::FETCH_ASSOC); /** @var BuildErrorStore $errorStore */ - $errorStore = Factory::getStore('BuildError'); + $errorStore = $this->storeRegistry->get('BuildError'); $rtn = array_reverse($rtn); $rtn = array_map(function ($item) use ($key, $errorStore, $buildId) { @@ -492,10 +492,10 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR public function setMeta($buildId, $key, $value) { /** @var BuildMetaStore $store */ - $store = Factory::getStore('BuildMeta'); + $store = $this->storeRegistry->get('BuildMeta'); $meta = $store->getByKey($buildId, $key); if (is_null($meta)) { - $meta = new BuildMeta(); + $meta = new BuildMeta($this->storeRegistry); $meta->setBuildId($buildId); $meta->setMetaKey($key); } @@ -539,7 +539,7 @@ public function getOldByProject($projectId, $keep = 100) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Build($item); + return new Build($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 2e95b0ed1..8d5f0717c 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -60,7 +60,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Environment($data); + return new Environment($this->storeRegistry, $data); } } @@ -91,7 +91,7 @@ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read' if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Environment($data); + return new Environment($this->storeRegistry, $data); } } @@ -123,7 +123,7 @@ public function getByProjectId($projectId, $useConnection = 'read') $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Environment($item); + return new Environment($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/Store/Factory.php b/src/Store/Factory.php deleted file mode 100644 index 8b595897d..000000000 --- a/src/Store/Factory.php +++ /dev/null @@ -1,63 +0,0 @@ -loadStore($storeName); - } - - /** - * @param string $store - * - * @return Store; - */ - public function loadStore($store) - { - if (!isset($this->loadedStores[$store])) { - $class = 'PHPCensor\\Store\\' . $store . 'Store'; - $obj = new $class(self::$databaseManager); - - $this->loadedStores[$store] = $obj; - } - - return $this->loadedStores[$store]; - } -} diff --git a/src/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php index 36f36343a..6d74821fc 100644 --- a/src/Store/ProjectGroupStore.php +++ b/src/Store/ProjectGroupStore.php @@ -60,7 +60,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new ProjectGroup($data); + return new ProjectGroup($this->storeRegistry, $data); } } @@ -90,7 +90,7 @@ public function getByTitle($title, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new ProjectGroup($data); + return new ProjectGroup($this->storeRegistry, $data); } } diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index efb6655ec..0dc6912ff 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -63,7 +63,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new Project($data); + return new Project($this->storeRegistry, $data); } } @@ -92,7 +92,7 @@ public function getByIds($values, $useConnection = 'read') $rtn = []; if ($stmt->execute()) { while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - $rtn[$data['id']] = new Project($data); + $rtn[$data['id']] = new Project($this->storeRegistry, $data); } } @@ -126,7 +126,7 @@ public function getByTitle($title, $limit = 1000, $useConnection = 'read') $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Project($item); + return new Project($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -185,7 +185,7 @@ public function getAll($archived = false) $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Project($item); + return new Project($this->storeRegistry, $item); }; $rtn = array_map($map, $res); @@ -228,7 +228,7 @@ public function getByGroupId($groupId, $archived = false, $limit = 1000, $useCon $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new Project($item); + return new Project($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index c1bdd1493..fd1f571da 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -62,7 +62,7 @@ public function getById($id, $useConnection = 'read') if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new User($data); + return new User($this->storeRegistry, $data); } } @@ -91,7 +91,7 @@ public function getByEmail($email) if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new User($data); + return new User($this->storeRegistry, $data); } } @@ -119,7 +119,7 @@ public function getByEmailOrName($emailOrName) if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new User($data); + return new User($this->storeRegistry, $data); } } @@ -147,7 +147,7 @@ public function getByRememberKey($rememberKey) if ($stmt->execute()) { if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { - return new User($data); + return new User($this->storeRegistry, $data); } } @@ -180,7 +180,7 @@ public function getByName($name, $limit = 1000, $useConnection = 'read') $res = $stmt->fetchAll(PDO::FETCH_ASSOC); $map = function ($item) { - return new User($item); + return new User($this->storeRegistry, $item); }; $rtn = array_map($map, $res); diff --git a/src/StoreRegistry.php b/src/StoreRegistry.php new file mode 100644 index 000000000..86b146b1f --- /dev/null +++ b/src/StoreRegistry.php @@ -0,0 +1,34 @@ +databaseManager = $databaseManager; + } + + public function get(string $storeName): ?Store + { + if (!isset($this->loadedStores[$storeName])) { + $class = 'PHPCensor\\Store\\' . $storeName . 'Store'; + $store = new $class($this->databaseManager, $this); + + $this->loadedStores[$storeName] = $store; + } + + return $this->loadedStores[$storeName]; + } +} diff --git a/src/View.php b/src/View.php index b8f43f16a..acd2107b1 100644 --- a/src/View.php +++ b/src/View.php @@ -4,7 +4,6 @@ use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\User; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; class View @@ -111,21 +110,4 @@ public function render() return $html; } - - /** - * @return User|null - * - * @throws Exception\HttpException - */ - protected function getUser() - { - if (empty($_SESSION['php-censor-user-id'])) { - return null; - } - - /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); - - return $userStore->getById($_SESSION['php-censor-user-id']); - } } diff --git a/src/View/Build/view.phtml b/src/View/Build/view.phtml index cd99a2b2f..c5dd67453 100644 --- a/src/View/Build/view.phtml +++ b/src/View/Build/view.phtml @@ -4,11 +4,12 @@ use PHPCensor\Helper\Lang; use PHPCensor\Helper\Template; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; +use PHPCensor\Model\Environment; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; /** - * @var Build $build + * @var Build $build + * @var Environment $environment */ ?> @@ -59,18 +60,11 @@ use PHPCensor\Store\Factory; getEnvironmentId(); - $environment = null; - if ($environmentId) { - /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); - $environmentObject = $environmentStore->getById($environmentId); - if ($environmentObject) { - $environment = $environmentObject->getName(); - } + if ($environment) { + $environmentName = $environment->getName(); } - echo !empty($environment) ? (' ' . $environment) : '—' ; + echo !empty($environmentName) ? (' ' . $environmentName) : '—' ; ?> diff --git a/src/View/BuildStatus/view.phtml b/src/View/BuildStatus/view.phtml index d60f9008f..ede0a6292 100644 --- a/src/View/BuildStatus/view.phtml +++ b/src/View/BuildStatus/view.phtml @@ -4,7 +4,10 @@ use PHPCensor\Helper\Lang; use PHPCensor\Helper\Template; use PHPCensor\Model\Build; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; + +/** + * @var EnvironmentStore $environmentStore + */ if (!empty($latest)): ?> @@ -155,8 +158,6 @@ if (!empty($latest)): ?> $environmentId = $build->getEnvironmentId(); $environment = null; if ($environmentId) { - /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); $environmentObject = $environmentStore->getById($environmentId); if ($environmentObject) { $environment = $environmentObject->getName(); diff --git a/src/View/Group/index.phtml b/src/View/Group/index.phtml index ad77d595b..d448f2b95 100644 --- a/src/View/Group/index.phtml +++ b/src/View/Group/index.phtml @@ -1,6 +1,12 @@
    @@ -26,7 +32,7 @@ use PHPCensor\Helper\Lang;
    - getUser()->getIsAdmin() && (!count($group['projects']))): ?> + getIsAdmin() && (!count($group['projects']))): ?> diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml index 331f8196f..a66578c72 100644 --- a/src/View/Project/ajax-builds.phtml +++ b/src/View/Project/ajax-builds.phtml @@ -2,11 +2,13 @@ use PHPCensor\Helper\Lang; use PHPCensor\Model\Build; +use PHPCensor\Model\User; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; /** - * @var Build[] $builds + * @var Build[] $builds + * @var EnvironmentStore $environmentStore + * @var User $user */ ?> @@ -92,8 +94,6 @@ $branches = $build->getExtra('branches'); $environmentId = $build->getEnvironmentId(); $environment = null; if ($environmentId) { - /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); $environmentObject = $environmentStore->getById($environmentId); if ($environmentObject) { $environment = $environmentObject->getName(); @@ -123,7 +123,7 @@ $branches = $build->getExtra('branches');
    - getUser()->getIsAdmin()): ?> + getIsAdmin()): ?> diff --git a/src/View/Project/view.phtml b/src/View/Project/view.phtml index f588eb3be..07e45a4bc 100644 --- a/src/View/Project/view.phtml +++ b/src/View/Project/view.phtml @@ -3,9 +3,11 @@ use JasonGrimes\Paginator; use PHPCensor\Helper\Lang; use PHPCensor\Model\Project; +use PHPCensor\Model\User; /** * @var Paginator $paginator + * @var User $user */ ?> @@ -22,11 +24,11 @@ use PHPCensor\Model\Project; - getUser()->getIsAdmin()): ?> + getIsAdmin()): ?> - + @@ -39,7 +41,7 @@ use PHPCensor\Model\Project; getId(); ?>
    getArchived()): ?> - getUser()->getIsAdmin()): ?> + getIsAdmin()): ?> diff --git a/src/View/User/index.phtml b/src/View/User/index.phtml index b702fd325..554368c38 100644 --- a/src/View/User/index.phtml +++ b/src/View/User/index.phtml @@ -2,8 +2,11 @@ use PHPCensor\Helper\Lang; use PHPCensor\Helper\Template; +use PHPCensor\Model\User; -$currentUser = $this->getUser(); +/** + * @var User $currentUser + */ ?>
    diff --git a/src/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml index c1662e52e..d6fb14dcf 100644 --- a/src/View/WidgetLastBuilds/update.phtml +++ b/src/View/WidgetLastBuilds/update.phtml @@ -4,10 +4,10 @@ use PHPCensor\Helper\Lang; use PHPCensor\Helper\Template; use PHPCensor\Model\Build; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\Factory; /** - * @var Build[] $builds + * @var Build[] $builds + * @var EnvironmentStore $environmentStore */ ?> @@ -19,8 +19,6 @@ use PHPCensor\Store\Factory; $environmentId = $build->getEnvironmentId(); $environment = null; if ($environmentId) { - /** @var EnvironmentStore $environmentStore */ - $environmentStore = Factory::getStore('Environment'); $environmentObject = $environmentStore->getById($environmentId); if ($environmentObject) { $environment = $environmentObject->getName(); diff --git a/src/View/exception.phtml b/src/View/exception.phtml index fff7cd7bf..3f31c8db4 100644 --- a/src/View/exception.phtml +++ b/src/View/exception.phtml @@ -3,12 +3,10 @@ use PHPCensor\Model\User; /** - * @var $exception Exception + * @var Exception $exception + * @var User $user */ -/** @var User $user */ -$user = $this->getUser(); - ?>
    diff --git a/src/View/layout.phtml b/src/View/layout.phtml index a382c06f1..ed13f97af 100644 --- a/src/View/layout.phtml +++ b/src/View/layout.phtml @@ -3,17 +3,13 @@ use PHPCensor\Helper\Lang; use PHPCensor\Model\User; -/** - * @var User $user - */ -$user = $this->getUser(); - /** * @var string $title * @var string $subtitle * @var string $version * @var string $content * @var string $skin + * @var User $user */ ?> diff --git a/src/WebController.php b/src/WebController.php index b19105aad..db7f6890f 100644 --- a/src/WebController.php +++ b/src/WebController.php @@ -7,7 +7,6 @@ use PHPCensor\Http\Request; use PHPCensor\Http\Response; use PHPCensor\Model\User; -use PHPCensor\Store\Factory; use PHPCensor\Store\UserStore; abstract class WebController extends Controller @@ -32,13 +31,12 @@ abstract class WebController extends Controller */ public $layout = null; - /** - * @param ConfigurationInterface $config - * @param Request $request - */ - public function __construct(ConfigurationInterface $config, Request $request) - { - parent::__construct($config, $request); + public function __construct( + ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, + Request $request + ) { + parent::__construct($configuration, $storeRegistry, $request); $class = explode('\\', get_class($this)); $this->className = substr(array_pop($class), 0, -10); @@ -58,20 +56,21 @@ public function init() $this->layout->version = $version; $this->layout->isLoginDisabled = (bool)$this->configuration->get('php-censor.security.disable_auth', false); - $groups = []; - $groupStore = Factory::getStore('ProjectGroup'); - $groupList = $groupStore->getWhere([], 100, 0, ['title' => 'ASC']); + $groups = []; + $groupStore = $this->storeRegistry->get('ProjectGroup'); + $groupList = $groupStore->getWhere([], 100, 0, ['title' => 'ASC']); foreach ($groupList['items'] as $group) { $thisGroup = ['title' => $group->getTitle()]; - $projects = Factory::getStore('Project')->getByGroupId($group->getId(), false); + $projects = $this->storeRegistry->get('Project')->getByGroupId($group->getId(), false); $thisGroup['projects'] = $projects['items']; $groups[] = $thisGroup; } - $archivedProjects = Factory::getStore('Project')->getAll(true); + $archivedProjects = $this->storeRegistry->get('Project')->getAll(true); $this->layout->archivedProjects = $archivedProjects['items']; $this->layout->groups = $groups; + $this->layout->user = $this->getUser(); } } @@ -157,7 +156,7 @@ protected function getUser() } /** @var UserStore $userStore */ - $userStore = Factory::getStore('User'); + $userStore = $this->storeRegistry->get('User'); return $userStore->getById($_SESSION['php-censor-user-id']); } diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 6e0a4a99a..5036cc072 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -16,8 +16,8 @@ use PHPCensor\Logging\BuildDBLogHandler; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; -use PHPCensor\Store\Factory; -use Psr\Log\LoggerInterface; +use PHPCensor\Store\BuildStore; +use PHPCensor\StoreRegistry; class BuildWorker { @@ -34,7 +34,7 @@ class BuildWorker /** * The logger for builds to use. */ - private LoggerInterface $logger; + private Logger $logger; private BuildService $buildService; @@ -42,6 +42,8 @@ class BuildWorker private DatabaseManager $databaseManager; + private StoreRegistry $storeRegistry; + /** * beanstalkd queue to watch */ @@ -54,7 +56,8 @@ class BuildWorker public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, - LoggerInterface $logger, + StoreRegistry $storeRegistry, + Logger $logger, BuildService $buildService, string $queueHost, int $queuePort, @@ -65,6 +68,7 @@ public function __construct( $this->buildService = $buildService; $this->configuration = $configuration; $this->databaseManager = $databaseManager; + $this->storeRegistry = $storeRegistry; $this->queueTube = $queueTube; $this->pheanstalk = Pheanstalk::create($queueHost, $queuePort); @@ -89,7 +93,7 @@ protected function runWorker() { $this->pheanstalk->watchOnly($this->queueTube); - $buildStore = Factory::getStore('Build'); + $buildStore = $this->storeRegistry->get('Build'); while ($this->canRun) { if ($this->canPeriodicalWork && @@ -120,7 +124,11 @@ protected function runWorker() ) ); - $build = BuildFactory::getBuildById($this->configuration, (int)$jobData['build_id']); + $build = BuildFactory::getBuildById( + $this->configuration, + $this->storeRegistry, + (int)$jobData['build_id'] + ); if (!$build) { $this->logger->warning( @@ -153,13 +161,17 @@ protected function runWorker() continue; } + /** @var BuildStore $buildStore */ + $buildStore = $this->storeRegistry->get('Build'); + // Logging relevant to this build should be stored against the build itself. - $buildDbLog = new BuildDBLogHandler($build, Logger::DEBUG); + $buildDbLog = new BuildDBLogHandler($buildStore, $build, Logger::DEBUG); $this->logger->pushHandler($buildDbLog); $builder = new Builder( $this->configuration, $this->databaseManager, + $this->storeRegistry, $build, $this->logger ); diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index d8c0f7809..ca4e75d7a 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -44,13 +44,17 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\DatabaseManager') ->setConstructorArgs([$this->configuration]) ->getMock(); + $storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); $userStoreMock = $this ->getMockBuilder('PHPCensor\Store\UserStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); - $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $this->logger, $userStoreMock); + $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $userStoreMock); $this->helper = $this ->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper') diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index d48832376..8c22d5251 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -39,12 +39,20 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\DatabaseManager') ->setConstructorArgs([$this->configuration]) ->getMock(); + $storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); - $projectMock = $this->getMockBuilder('PHPCensor\Model\Project')->getMock(); + $projectMock = $this + ->getMockBuilder('PHPCensor\Model\Project') + ->setConstructorArgs([$storeRegistry]) + ->getMock(); $projectStoreMock = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); $projectStoreMock->method('getById') ->will($this->returnValueMap([ @@ -63,7 +71,7 @@ protected function setUp(): void [$projectMock, null, 'master', null, null, null] ); - $this->command = new CreateBuildCommand($this->configuration, $this->databaseManager, $this->logger, $projectStoreMock, $buildServiceMock); + $this->command = new CreateBuildCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $projectStoreMock, $buildServiceMock); $this->application = new Application(); } diff --git a/tests/src/Helper/BuildInterpolatorTest.php b/tests/src/Helper/BuildInterpolatorTest.php index 5028c9a48..c32c4ae75 100644 --- a/tests/src/Helper/BuildInterpolatorTest.php +++ b/tests/src/Helper/BuildInterpolatorTest.php @@ -3,6 +3,7 @@ namespace Tests\PHPCensor\Helper; use PHPCensor\Helper\BuildInterpolator; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; @@ -10,15 +11,25 @@ class BuildInterpolatorTest extends TestCase { use ProphecyTrait; - /** - * @var BuildInterpolator - */ - protected $testedInterpolator; + protected BuildInterpolator $testedInterpolator; + + protected StoreRegistry $storeRegistry; protected function setUp(): void { - parent::setup(); - $this->testedInterpolator = new BuildInterpolator(); + parent::setUp(); + + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + + $this->testedInterpolator = new BuildInterpolator($this->storeRegistry); } public function testInterpolate_LeavesStringsUnchangedByDefault() diff --git a/tests/src/Model/Base/BuildErrorTest.php b/tests/src/Model/Base/BuildErrorTest.php index 920bf714b..fdd23ab94 100644 --- a/tests/src/Model/Base/BuildErrorTest.php +++ b/tests/src/Model/Base/BuildErrorTest.php @@ -4,13 +4,29 @@ use DateTime; use PHPCensor\Model\Base\BuildError; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class BuildErrorTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $buildError); self::assertInstanceOf('PHPCensor\Model\Base\BuildError', $buildError); @@ -32,7 +48,7 @@ public function testConstruct() public function testId() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setId(100); self::assertEquals(true, $result); @@ -44,7 +60,7 @@ public function testId() public function testBuildId() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setBuildId(200); self::assertEquals(true, $result); @@ -56,7 +72,7 @@ public function testBuildId() public function testPlugin() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setPlugin('plugin'); self::assertEquals(true, $result); @@ -68,7 +84,7 @@ public function testPlugin() public function testFile() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setFile('file.php'); self::assertEquals(true, $result); @@ -80,7 +96,7 @@ public function testFile() public function testLineStart() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setLineStart(5); self::assertEquals(true, $result); @@ -92,7 +108,7 @@ public function testLineStart() public function testLineEnd() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setLineEnd(10); self::assertEquals(true, $result); @@ -104,7 +120,7 @@ public function testLineEnd() public function testSeverity() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setSeverity(BuildError::SEVERITY_CRITICAL); self::assertEquals(true, $result); @@ -116,7 +132,7 @@ public function testSeverity() public function testMessage() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setMessage('message'); self::assertEquals(true, $result); @@ -128,10 +144,10 @@ public function testMessage() public function testCreateDate() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); self::assertEquals(null, $buildError->getCreateDate()); - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $createDate = new DateTime(); $result = $buildError->setCreateDate($createDate); @@ -144,7 +160,7 @@ public function testCreateDate() public function testHash() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setHash('hash'); self::assertEquals(true, $result); @@ -156,7 +172,7 @@ public function testHash() public function testIsNew() { - $buildError = new BuildError(); + $buildError = new BuildError($this->storeRegistry); $result = $buildError->setIsNew(true); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/BuildMetaTest.php b/tests/src/Model/Base/BuildMetaTest.php index 5ae55f855..52ed54abe 100644 --- a/tests/src/Model/Base/BuildMetaTest.php +++ b/tests/src/Model/Base/BuildMetaTest.php @@ -3,13 +3,29 @@ namespace Tests\PHPCensor\Model\Base; use PHPCensor\Model\Base\BuildMeta; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class BuildMetaTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $buildMeta = new BuildMeta(); + $buildMeta = new BuildMeta($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $buildMeta); self::assertInstanceOf('PHPCensor\Model\Base\BuildMeta', $buildMeta); @@ -24,7 +40,7 @@ public function testConstruct() public function testId() { - $buildMeta = new BuildMeta(); + $buildMeta = new BuildMeta($this->storeRegistry); $result = $buildMeta->setId(100); self::assertEquals(true, $result); @@ -36,7 +52,7 @@ public function testId() public function testBuildId() { - $buildMeta = new BuildMeta(); + $buildMeta = new BuildMeta($this->storeRegistry); $result = $buildMeta->setBuildId(200); self::assertEquals(true, $result); @@ -48,7 +64,7 @@ public function testBuildId() public function testMetaKey() { - $buildMeta = new BuildMeta(); + $buildMeta = new BuildMeta($this->storeRegistry); $result = $buildMeta->setMetaKey('key'); self::assertEquals(true, $result); @@ -60,7 +76,7 @@ public function testMetaKey() public function testMetaValue() { - $buildMeta = new BuildMeta(); + $buildMeta = new BuildMeta($this->storeRegistry); $result = $buildMeta->setMetaValue('value'); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/BuildTest.php b/tests/src/Model/Base/BuildTest.php index 890e2aefd..35cf3a0f0 100644 --- a/tests/src/Model/Base/BuildTest.php +++ b/tests/src/Model/Base/BuildTest.php @@ -5,13 +5,29 @@ use DateTime; use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Base\Build; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class BuildTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $build); self::assertInstanceOf('PHPCensor\Model\Base\Build', $build); @@ -42,7 +58,7 @@ public function testConstruct() public function testId() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setId(100); self::assertEquals(true, $result); @@ -59,7 +75,7 @@ public function testId() */ public function testParentId() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertEquals(0, $build->getParentId()); @@ -73,7 +89,7 @@ public function testParentId() public function testProjectId() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setProjectId(200); self::assertEquals(true, $result); @@ -85,7 +101,7 @@ public function testProjectId() public function testCommitId() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setCommitId('commit'); self::assertEquals(true, $result); @@ -97,7 +113,7 @@ public function testCommitId() public function testStatus() { - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setStatusFailed(); self::assertEquals(Build::STATUS_FAILED, $build->getStatus()); @@ -108,7 +124,7 @@ public function testStatus() public function testLog() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setLog('log'); self::assertEquals(true, $result); @@ -120,7 +136,7 @@ public function testLog() public function testBranch() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setBranch('branch'); self::assertEquals(true, $result); @@ -132,7 +148,7 @@ public function testBranch() public function testTag() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setTag('tag'); self::assertEquals(true, $result); @@ -144,10 +160,10 @@ public function testTag() public function testCreateDate() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertEquals(null, $build->getCreateDate()); - $build = new Build(); + $build = new Build($this->storeRegistry); $createDate = new DateTime(); $result = $build->setCreateDate($createDate); @@ -160,10 +176,10 @@ public function testCreateDate() public function testStartDate() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertEquals(null, $build->getStartDate()); - $build = new Build(); + $build = new Build($this->storeRegistry); $createDate = new DateTime(); $result = $build->setStartDate($createDate); @@ -176,10 +192,10 @@ public function testStartDate() public function testFinishDate() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertEquals(null, $build->getFinishDate()); - $build = new Build(); + $build = new Build($this->storeRegistry); $createDate = new DateTime(); $result = $build->setFinishDate($createDate); @@ -192,7 +208,7 @@ public function testFinishDate() public function testCommitterEmail() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setCommitterEmail('email@email.com'); self::assertEquals(true, $result); @@ -204,7 +220,7 @@ public function testCommitterEmail() public function testCommitMessage() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setCommitMessage('message'); self::assertEquals(true, $result); @@ -216,7 +232,7 @@ public function testCommitMessage() public function testExtra() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setExtra(['key-1' => 'value-1', 'key-2' => 'value-2']); self::assertEquals(true, $result); @@ -230,7 +246,7 @@ public function testExtra() public function testEnvironment() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setEnvironmentId(22); self::assertEquals(true, $result); @@ -242,7 +258,7 @@ public function testEnvironment() public function testSource() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED); self::assertEquals(true, $result); @@ -257,7 +273,7 @@ public function testSource() public function testUserId() { - $build = new Build(); + $build = new Build($this->storeRegistry); $result = $build->setUserId(300); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/EnvironmentTest.php b/tests/src/Model/Base/EnvironmentTest.php index f29d9458c..9814b34d4 100644 --- a/tests/src/Model/Base/EnvironmentTest.php +++ b/tests/src/Model/Base/EnvironmentTest.php @@ -3,13 +3,29 @@ namespace Tests\PHPCensor\Model\Base; use PHPCensor\Model\Base\Environment; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class EnvironmentTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $environment); self::assertInstanceOf('PHPCensor\Model\Base\Environment', $environment); @@ -24,7 +40,7 @@ public function testConstruct() public function testId() { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); $result = $environment->setId(100); self::assertEquals(true, $result); @@ -36,7 +52,7 @@ public function testId() public function testProjectId() { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); $result = $environment->setProjectId(200); self::assertEquals(true, $result); @@ -48,7 +64,7 @@ public function testProjectId() public function testName() { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); $result = $environment->setName('name'); self::assertEquals(true, $result); @@ -60,7 +76,7 @@ public function testName() public function testBranches() { - $environment = new Environment(); + $environment = new Environment($this->storeRegistry); $result = $environment->setBranches(['branch-1', 'branch-2']); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/ProjectGroupTest.php b/tests/src/Model/Base/ProjectGroupTest.php index 811b87c64..6d9445478 100644 --- a/tests/src/Model/Base/ProjectGroupTest.php +++ b/tests/src/Model/Base/ProjectGroupTest.php @@ -4,13 +4,29 @@ use DateTime; use PHPCensor\Model\Base\ProjectGroup; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class ProjectGroupTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $projectGroup); self::assertInstanceOf('PHPCensor\Model\Base\ProjectGroup', $projectGroup); @@ -25,7 +41,7 @@ public function testConstruct() public function testId() { - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); $result = $projectGroup->setId(100); self::assertEquals(true, $result); @@ -37,7 +53,7 @@ public function testId() public function testTitle() { - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); $result = $projectGroup->setTitle('title'); self::assertEquals(true, $result); @@ -49,10 +65,10 @@ public function testTitle() public function testCreateDate() { - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); self::assertEquals(null, $projectGroup->getCreateDate()); - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); $createDate = new DateTime(); $result = $projectGroup->setCreateDate($createDate); @@ -65,7 +81,7 @@ public function testCreateDate() public function testUserId() { - $projectGroup = new ProjectGroup(); + $projectGroup = new ProjectGroup($this->storeRegistry); $result = $projectGroup->setUserId(200); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/ProjectTest.php b/tests/src/Model/Base/ProjectTest.php index 8bb2ed900..879633f53 100644 --- a/tests/src/Model/Base/ProjectTest.php +++ b/tests/src/Model/Base/ProjectTest.php @@ -4,13 +4,29 @@ use DateTime; use PHPCensor\Model\Base\Project; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class ProjectTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $project = new Project(); + $project = new Project($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $project); self::assertInstanceOf('PHPCensor\Model\Base\Project', $project); @@ -37,7 +53,7 @@ public function testConstruct() public function testId() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setId(100); self::assertEquals(true, $result); @@ -49,7 +65,7 @@ public function testId() public function testTitle() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setTitle('title'); self::assertEquals(true, $result); @@ -61,7 +77,7 @@ public function testTitle() public function testReference() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setReference('git://reference'); self::assertEquals(true, $result); @@ -73,7 +89,7 @@ public function testReference() public function testBranch() { - $project = new Project(); + $project = new Project($this->storeRegistry); self::assertEquals(null, $project->getDefaultBranch()); @@ -87,7 +103,7 @@ public function testBranch() public function testDefaultBranchOnly() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setDefaultBranchOnly(true); self::assertEquals(true, $result); @@ -99,7 +115,7 @@ public function testDefaultBranchOnly() public function testSshPrivateKey() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setSshPrivateKey('private-key'); self::assertEquals(true, $result); @@ -111,7 +127,7 @@ public function testSshPrivateKey() public function testSshPublicKey() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setSshPublicKey('public-key'); self::assertEquals(true, $result); @@ -123,7 +139,7 @@ public function testSshPublicKey() public function testType() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setType('git'); self::assertEquals(true, $result); @@ -138,7 +154,7 @@ public function testType() public function testAccessInformation() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setAccessInformation(['key-1' => 'value-1', 'key-2' => 'value-2']); self::assertEquals(true, $result); @@ -152,7 +168,7 @@ public function testAccessInformation() public function testBuildConfig() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setBuildConfig('config'); self::assertEquals(true, $result); @@ -164,7 +180,7 @@ public function testBuildConfig() public function testOverwriteBuildConfig() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setOverwriteBuildConfig(false); self::assertEquals(true, $result); @@ -176,7 +192,7 @@ public function testOverwriteBuildConfig() public function testAllowPublicStatus() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setAllowPublicStatus(true); self::assertEquals(true, $result); @@ -188,7 +204,7 @@ public function testAllowPublicStatus() public function testArchived() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setArchived(true); self::assertEquals(true, $result); @@ -200,7 +216,7 @@ public function testArchived() public function testGroupId() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setGroupId(200); self::assertEquals(true, $result); @@ -212,10 +228,10 @@ public function testGroupId() public function testCreateDate() { - $project = new Project(); + $project = new Project($this->storeRegistry); self::assertEquals(null, $project->getCreateDate()); - $project = new Project(); + $project = new Project($this->storeRegistry); $createDate = new DateTime(); $result = $project->setCreateDate($createDate); @@ -228,7 +244,7 @@ public function testCreateDate() public function testUserId() { - $project = new Project(); + $project = new Project($this->storeRegistry); $result = $project->setUserId(300); self::assertEquals(true, $result); diff --git a/tests/src/Model/Base/UserTest.php b/tests/src/Model/Base/UserTest.php index 198003293..79f4107f6 100644 --- a/tests/src/Model/Base/UserTest.php +++ b/tests/src/Model/Base/UserTest.php @@ -3,13 +3,29 @@ namespace Tests\PHPCensor\Model\Base; use PHPCensor\Model\Base\User; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class UserTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $user = new User(); + $user = new User($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $user); self::assertInstanceOf('PHPCensor\Model\Base\User', $user); @@ -30,7 +46,7 @@ public function testConstruct() public function testId() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setId(100); self::assertEquals(true, $result); @@ -42,7 +58,7 @@ public function testId() public function testEmail() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setEmail('email@email.com'); self::assertEquals(true, $result); @@ -54,7 +70,7 @@ public function testEmail() public function testHash() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setHash('hash'); self::assertEquals(true, $result); @@ -66,7 +82,7 @@ public function testHash() public function testIsAdmin() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setIsAdmin(true); self::assertEquals(true, $result); @@ -78,7 +94,7 @@ public function testIsAdmin() public function testName() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setName('name'); self::assertEquals(true, $result); @@ -90,7 +106,7 @@ public function testName() public function testLanguage() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setLanguage('la'); self::assertEquals(true, $result); @@ -102,7 +118,7 @@ public function testLanguage() public function testPerPage() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setPerPage(10); self::assertEquals(true, $result); @@ -114,7 +130,7 @@ public function testPerPage() public function testProviderKey() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setProviderKey('key'); self::assertEquals(true, $result); @@ -126,7 +142,7 @@ public function testProviderKey() public function testProviderData() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setProviderData(['key-1' => 'value-1', 'key-2' => 'value-2']); self::assertEquals(true, $result); @@ -140,7 +156,7 @@ public function testProviderData() public function testRememberKey() { - $user = new User(); + $user = new User($this->storeRegistry); $result = $user->setRememberKey('remember'); self::assertEquals(true, $result); diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index 09bbc8813..231a04a32 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -6,6 +6,7 @@ use PHPCensor\Model\Build; use PHPCensor\Model\Build\GogsBuild; use PHPCensor\Model\Project; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -15,14 +16,29 @@ */ class BuildTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testConstruct() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertInstanceOf('PHPCensor\Model', $build); self::assertInstanceOf('PHPCensor\Model\Build', $build); - $build = new Build([ + $build = new Build($this->storeRegistry, [ 'project_id' => 100, 'branch' => 'master', ]); @@ -51,7 +67,7 @@ public function testConstruct() ], $build->getDataArray()); try { - $build = new Build([ + $build = new Build($this->storeRegistry, [ 'project_id' => 101, 'branch' => 'dev', 'unknown' => 'unknown', @@ -63,7 +79,7 @@ public function testConstruct() ); } - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setLog('log'); self::assertEquals('log', $build->getLog()); @@ -103,7 +119,7 @@ public function testConstruct() public function testExecute_TestBaseBuildDefaults() { - $build = new Build(); + $build = new Build($this->storeRegistry); self::assertEquals('#', $build->getCommitLink()); self::assertEquals('#', $build->getBranchLink()); self::assertEquals(null, $build->getFileLinkTemplate()); @@ -111,7 +127,7 @@ public function testExecute_TestBaseBuildDefaults() public function testExecute_TestIsSuccessful() { - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setStatusPending(); self::assertFalse($build->isSuccessful()); @@ -132,7 +148,7 @@ public function testExecute_TestBuildExtra() 'item2' => 2, ]; - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setExtra($info); self::assertEquals('Item One', $build->getExtra('item1')); @@ -148,14 +164,14 @@ public function testExecute_TestBuildExtra() public function testGogsBuildLinks() { - $project = new Project(); + $project = new Project($this->storeRegistry); $project->setType(Project::TYPE_GOGS); $project->setReference('https://gogs.repository/the-vendor/the-project.git'); $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); $stub = $this->getMockBuilder(GogsBuild::class) - ->setConstructorArgs([$configuration]) + ->setConstructorArgs([$configuration, $this->storeRegistry]) ->setMethods(['getProject', 'getCommitId', 'getBranch']) ->getMock(); diff --git a/tests/src/Model/ProjectTest.php b/tests/src/Model/ProjectTest.php index bebc7515c..b84f457ca 100644 --- a/tests/src/Model/ProjectTest.php +++ b/tests/src/Model/ProjectTest.php @@ -5,6 +5,7 @@ use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model; use PHPCensor\Model\Project; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -14,9 +15,24 @@ */ class ProjectTest extends TestCase { + protected StoreRegistry $storeRegistry; + + protected function setUp(): void + { + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + public function testExecute_TestIsAValidModel() { - $project = new Project(); + $project = new Project($this->storeRegistry); self::assertTrue($project instanceof Model); try { @@ -36,7 +52,7 @@ public function testExecute_TestProjectAccessInformation() 'item2' => 2, ]; - $project = new Project(); + $project = new Project($this->storeRegistry); $project->setAccessInformation($info); self::assertEquals('Item One', $project->getAccessInformation('item1')); diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index 6ed5e959b..dbb102e2d 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -7,6 +7,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\EmailNotify as EmailPlugin; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -53,13 +54,23 @@ class EmailTest extends TestCase */ public $mailDelivered; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { $this->message = []; $this->mailDelivered = true; $self = $this; - new Configuration(''); + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); $this->mockProject = $this ->getMockBuilder('\PHPCensor\Model\Project') @@ -106,7 +117,7 @@ protected function setUp(): void $this->mockBuilder->buildPath = "/"; - $interpolator = new BuildInterpolator(); + $interpolator = new BuildInterpolator($this->storeRegistry); $this->mockBuilder->expects($this->any()) ->method('interpolate') ->will($this->returnCallback(function () use ($self, $interpolator) { diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index 9c55e1516..62783abf2 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -2,7 +2,6 @@ namespace Tests\PHPCensor\Plugin; -use PHPCensor\Store\Factory; use PHPUnit\Framework\TestCase; /** @@ -64,10 +63,19 @@ protected function getPluginBuilder($options = []) ->getMockBuilder('\PHPCensor\DatabaseManager') ->setConstructorArgs([$mockConfiguration]) ->getMock(); + $storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$mockDatabaseManager]) + ->getMock(); - Factory::$databaseManager = $mockDatabaseManager; + $storeRegistry + ->method('get') + ->willReturn(null); - $mockBuild = $this->getMockBuilder('\PHPCensor\Model\Build')->getMock(); + $mockBuild = $this + ->getMockBuilder('\PHPCensor\Model\Build') + ->setConstructorArgs([$storeRegistry]) + ->getMock(); $mockBuild ->method('getId') @@ -77,9 +85,10 @@ protected function getPluginBuilder($options = []) ->method('getProjectId') ->willReturn(1); - $mockBuilder = $this->getMockBuilder('\PHPCensor\Builder') - ->setConstructorArgs([$mockConfiguration, $mockDatabaseManager, $mockBuild, $loggerMock]) - ->setMethods(['executeCommand'])->getMock(); + $mockBuilder = $this->getMockBuilder('\PHPCensor\Builder') + ->setConstructorArgs([$mockConfiguration, $mockDatabaseManager, $storeRegistry, $mockBuild, $loggerMock]) + ->setMethods(['executeCommand']) + ->getMock(); return $this->getMockBuilder('PHPCensor\Plugin\PhpUnit')->setConstructorArgs( [$mockBuilder, $mockBuild, $options] diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index a2aa05845..bf2ede5ad 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -4,6 +4,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin\Util\Executor; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; @@ -24,13 +25,27 @@ class ExecutorTest extends TestCase protected $mockStore; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { parent::setUp(); + + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + $this->mockBuildLogger = $this->prophesize('\PHPCensor\Logging\BuildLogger'); $this->mockFactory = $this->prophesize('\PHPCensor\Plugin\Util\Factory'); $this->mockStore = $this->prophesize('\PHPCensor\Store\BuildStore'); $this->testedExecutor = new Executor( + $this->storeRegistry, $this->mockFactory->reveal(), $this->mockBuildLogger->reveal(), $this->mockStore->reveal() @@ -75,7 +90,7 @@ public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin() { $options = []; $pluginName = 'PhpUnit'; - $build = new Build(); + $build = new Build($this->storeRegistry); $mockPlugin = $this->prophesize('PHPCensor\Plugin'); $mockPlugin->execute()->shouldBeCalledTimes(1); @@ -135,7 +150,7 @@ public function testExecutePlugins_CallsEachPluginForStage() { $phpUnitPluginOptions = []; $behatPluginOptions = []; - $build = new Build(); + $build = new Build($this->storeRegistry); $config = [ 'stageOne' => [ diff --git a/tests/src/PluginTest.php b/tests/src/PluginTest.php index 63561b86b..33032eb39 100644 --- a/tests/src/PluginTest.php +++ b/tests/src/PluginTest.php @@ -6,6 +6,8 @@ use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Plugin; +use PHPCensor\Store\BuildStore; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -77,6 +79,8 @@ class PluginTest extends TestCase */ private $currentDir; + private StoreRegistry $storeRegistry; + protected function setUp(): void { $this->currentDir = rtrim(realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; @@ -84,6 +88,22 @@ protected function setUp(): void $this->builder = $this->createMock(Builder::class); $this->build = $this->createMock(Build::class); + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + + $buildStore = new BuildStore($databaseManager, $this->storeRegistry); + + $this->storeRegistry + ->method('get') + ->willReturn($buildStore); + $this->build ->method('getBuildPath') ->willReturn($this->currentDir); @@ -92,7 +112,7 @@ protected function setUp(): void ->method('getCommitId') ->willReturn('commit_hash'); - $interpolator = new BuildInterpolator(); + $interpolator = new BuildInterpolator($this->storeRegistry); $interpolator->setupInterpolationVars($this->build, 'http://php-censor.local/', '1.0.0'); $this->builder diff --git a/tests/src/Security/Authentication/ServiceTest.php b/tests/src/Security/Authentication/ServiceTest.php index 102b2cb2f..6998472d5 100644 --- a/tests/src/Security/Authentication/ServiceTest.php +++ b/tests/src/Security/Authentication/ServiceTest.php @@ -6,6 +6,7 @@ use PHPCensor\Model\User; use PHPCensor\Security\Authentication\Service; use PHPCensor\Security\Authentication\UserProvider\AbstractProvider; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; @@ -15,16 +16,26 @@ class ServiceTest extends TestCase protected ConfigurationInterface $configuration; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { parent::setUp(); $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$this->configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); } public function testBuildBuiltinProvider() { - $provider = Service::buildProvider('test', ['type' => 'internal']); + $provider = Service::buildProvider($this->storeRegistry, 'test', ['type' => 'internal']); self::assertInstanceOf('\PHPCensor\Security\Authentication\UserProvider\Internal', $provider); } @@ -32,7 +43,7 @@ public function testBuildBuiltinProvider() public function testBuildAnyProvider() { $config = ['type' => '\Tests\PHPCensor\Security\Authentication\DummyProvider']; - $provider = Service::buildProvider('test', $config); + $provider = Service::buildProvider($this->storeRegistry, 'test', $config); self::assertInstanceOf('\Tests\PHPCensor\Security\Authentication\DummyProvider', $provider); self::assertEquals('test', $provider->getKey()); @@ -45,7 +56,7 @@ public function testGetProviders() $b = $this->prophesize('\PHPCensor\Security\Authentication\UserProviderInterface')->reveal(); $providers = ['a' => $a, 'b' => $b]; - $service = new Service($this->configuration, $providers); + $service = new Service($this->configuration, $this->storeRegistry, $providers); self::assertEquals($providers, $service->getProviders()); } @@ -56,7 +67,7 @@ public function testGetLoginPasswordProviders() $b = $this->prophesize('\PHPCensor\Security\Authentication\LoginPasswordProviderInterface')->reveal(); $providers = ['a' => $a, 'b' => $b]; - $service = new Service($this->configuration, $providers); + $service = new Service($this->configuration, $this->storeRegistry, $providers); self::assertEquals(['b' => $b], $service->getLoginPasswordProviders()); } diff --git a/tests/src/Security/Authentication/UserProvider/InternalTest.php b/tests/src/Security/Authentication/UserProvider/InternalTest.php index bbd79bcc1..361a477e8 100644 --- a/tests/src/Security/Authentication/UserProvider/InternalTest.php +++ b/tests/src/Security/Authentication/UserProvider/InternalTest.php @@ -4,6 +4,7 @@ use PHPCensor\Model\User; use PHPCensor\Security\Authentication\UserProvider\Internal; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; class InternalTest extends TestCase @@ -13,16 +14,28 @@ class InternalTest extends TestCase */ protected $provider; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { - $this->provider = new Internal('internal', [ + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + + $this->provider = new Internal($this->storeRegistry, 'internal', [ 'type' => 'internal', ]); } public function testVerifyPassword() { - $user = new User(); + $user = new User($this->storeRegistry); $password = 'bla'; $user->setHash(password_hash($password, PASSWORD_DEFAULT)); @@ -31,9 +44,9 @@ public function testVerifyPassword() public function testVerifyInvaldPassword() { - $user = new User(); + $user = new User($this->storeRegistry); $password = 'foo'; - $user->setHash(password_hash($password, PASSWORD_DEFAULT)); + $user->setHash(\password_hash($password, PASSWORD_DEFAULT)); self::assertFalse($this->provider->verifyPassword($user, 'bar')); } diff --git a/tests/src/Service/BuildServiceTest.php b/tests/src/Service/BuildServiceTest.php index 8e8728182..18f23ee1d 100644 --- a/tests/src/Service/BuildServiceTest.php +++ b/tests/src/Service/BuildServiceTest.php @@ -10,6 +10,7 @@ use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; use PHPCensor\Store\EnvironmentStore; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -27,6 +28,8 @@ class BuildServiceTest extends TestCase protected DatabaseManager $databaseManager; + protected StoreRegistry $storeRegistry; + protected EnvironmentStore $mockEnvironmentStore; protected function setUp(): void @@ -36,9 +39,13 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\DatabaseManager') ->setConstructorArgs([$this->configuration]) ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->mockBuildStore = $this ->getMockBuilder('PHPCensor\Store\BuildStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->mockBuildStore ->expects($this->any()) @@ -47,7 +54,7 @@ protected function setUp(): void $this->mockEnvironmentStore = $this ->getMockBuilder('PHPCensor\Store\EnvironmentStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->mockEnvironmentStore ->expects($this->any()) @@ -56,16 +63,22 @@ protected function setUp(): void $mockProjectStore = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); - $this->testedService = new BuildService($this->configuration, $this->mockBuildStore, $mockProjectStore); + $this->testedService = new BuildService( + $this->configuration, + $this->storeRegistry, + $this->mockBuildStore, + $mockProjectStore + ); } public function testExecute_CreateBasicBuild() { $project = $this ->getMockBuilder('PHPCensor\Model\Project') + ->setConstructorArgs([$this->storeRegistry]) ->setMethods(['getEnvironmentStore']) ->getMock(); @@ -97,6 +110,7 @@ public function testExecute_CreateBuildWithOptions() { $project = $this ->getMockBuilder('PHPCensor\Model\Project') + ->setConstructorArgs([$this->storeRegistry]) ->setMethods(['getEnvironmentStore']) ->getMock(); @@ -127,6 +141,7 @@ public function testExecute_CreateBuildWithExtra() { $project = $this ->getMockBuilder('PHPCensor\Model\Project') + ->setConstructorArgs([$this->storeRegistry]) ->setMethods(['getEnvironmentStore']) ->getMock(); @@ -159,7 +174,7 @@ public function testExecute_CreateBuildWithExtra() */ public function testExecute_CreateDuplicateBuild() { - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setId(1); $build->setProjectId(101); $build->setCommitId('abcde'); @@ -196,7 +211,7 @@ public function testExecute_DeleteBuild() { $store = $this ->getMockBuilder('PHPCensor\Store\BuildStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $store->expects($this->once()) ->method('delete') @@ -204,11 +219,16 @@ public function testExecute_DeleteBuild() $mockProjectStore = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); - $service = new BuildService($this->configuration, $store, $mockProjectStore); - $build = new Build(); + $service = new BuildService( + $this->configuration, + $this->storeRegistry, + $store, + $mockProjectStore + ); + $build = new Build($this->storeRegistry); self::assertEquals(true, $service->deleteBuild($build)); } diff --git a/tests/src/Service/BuiltStatusServiceTest.php b/tests/src/Service/BuildStatusServiceTest.php similarity index 89% rename from tests/src/Service/BuiltStatusServiceTest.php rename to tests/src/Service/BuildStatusServiceTest.php index bad81aaaa..0252d5563 100644 --- a/tests/src/Service/BuiltStatusServiceTest.php +++ b/tests/src/Service/BuildStatusServiceTest.php @@ -6,6 +6,7 @@ use PHPCensor\Model\Build; use PHPCensor\Model\Project; use PHPCensor\Service\BuildStatusService; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -17,14 +18,25 @@ class BuildStatusServiceTest extends TestCase { const BRANCH = 'master'; - /** @var Project */ - protected $project; + protected Project $project; - protected $timezone; + protected string $timezone; + + protected StoreRegistry $storeRegistry; protected function setUp(): void { - $project = new Project(); + $configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); + $databaseManager = $this + ->getMockBuilder('PHPCensor\DatabaseManager') + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$databaseManager]) + ->getMock(); + + $project = new Project($this->storeRegistry); $project->setId(3); $project->setDefaultBranch(self::BRANCH); $project->setTitle('Test'); @@ -83,7 +95,7 @@ protected function getBuild($configId, $setProject = true) ] ]; - $build = new Build(); + $build = new Build($this->storeRegistry); $build->setId($config[$configId]['id']); $build->setBranch(self::BRANCH); $build->setStatus($config[$configId]['status']); @@ -110,6 +122,7 @@ protected function getProjectMock($prevBuildId = null, $setProject = true) { $project = $this ->getMockBuilder('PHPCensor\Model\Project') + ->setConstructorArgs([$this->storeRegistry]) ->setMethods(['getLatestBuild']) ->getMock(); diff --git a/tests/src/Service/ProjectServiceTest.php b/tests/src/Service/ProjectServiceTest.php index 80a1349d9..d5f9e10d1 100644 --- a/tests/src/Service/ProjectServiceTest.php +++ b/tests/src/Service/ProjectServiceTest.php @@ -6,6 +6,7 @@ use PHPCensor\DatabaseManager; use PHPCensor\Model\Project; use PHPCensor\Service\ProjectService; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -29,6 +30,8 @@ class ProjectServiceTest extends TestCase protected DatabaseManager $databaseManager; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); @@ -36,10 +39,14 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\DatabaseManager') ->setConstructorArgs([$this->configuration]) ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->mockProjectStore = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->mockProjectStore @@ -49,7 +56,7 @@ protected function setUp(): void $this->returnArgument(0) ); - $this->testedService = new ProjectService($this->mockProjectStore); + $this->testedService = new ProjectService($this->storeRegistry, $this->mockProjectStore); } public function testExecuteCreateGithubProject() @@ -284,7 +291,7 @@ public function testExecuteCreateProjectWithOptions() public function testExecuteUpdateExistingProject() { - $project = new Project(); + $project = new Project($this->storeRegistry); $project->setTitle('Before Title'); $project->setReference('Before Reference'); $project->setType('github'); @@ -298,7 +305,7 @@ public function testExecuteUpdateExistingProject() public function testExecuteEmptyPublicStatus() { - $project = new Project(); + $project = new Project($this->storeRegistry); $project->setAllowPublicStatus(true); $options = [ @@ -316,14 +323,14 @@ public function testExecuteDeleteProject() { $store = $this ->getMockBuilder('PHPCensor\Store\ProjectStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $store->expects($this->once()) ->method('delete') ->will($this->returnValue(true)); - $service = new ProjectService($store); - $project = new Project(); + $service = new ProjectService($this->storeRegistry, $store); + $project = new Project($this->storeRegistry); self::assertEquals(true, $service->deleteProject($project)); } diff --git a/tests/src/Service/UserServiceTest.php b/tests/src/Service/UserServiceTest.php index f144c7ea7..bdb038fc4 100644 --- a/tests/src/Service/UserServiceTest.php +++ b/tests/src/Service/UserServiceTest.php @@ -6,6 +6,7 @@ use PHPCensor\DatabaseManager; use PHPCensor\Model\User; use PHPCensor\Service\UserService; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; /** @@ -30,6 +31,8 @@ class UserServiceTest extends TestCase protected DatabaseManager $databaseManager; + protected StoreRegistry $storeRegistry; + protected function setUp(): void { $this->configuration = $this->getMockBuilder('PHPCensor\ConfigurationInterface')->getMock(); @@ -37,17 +40,21 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\DatabaseManager') ->setConstructorArgs([$this->configuration]) ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder('PHPCensor\StoreRegistry') + ->setConstructorArgs([$this->databaseManager]) + ->getMock(); $this->mockUserStore = $this ->getMockBuilder('PHPCensor\Store\UserStore') - ->setConstructorArgs([$this->databaseManager]) + ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->mockUserStore ->expects($this->any()) ->method('save') ->will($this->returnArgument(0)); - $this->testedService = new UserService($this->mockUserStore); + $this->testedService = new UserService($this->storeRegistry, $this->mockUserStore); } public function testExecute_CreateNonAdminUser() @@ -83,7 +90,7 @@ public function testExecute_CreateAdminUser() public function testExecute_RevokeAdminStatus() { - $user = new User(); + $user = new User($this->storeRegistry); $user->setEmail('test@example.com'); $user->setName('Test'); $user->setIsAdmin(true); @@ -94,7 +101,7 @@ public function testExecute_RevokeAdminStatus() public function testExecute_GrantAdminStatus() { - $user = new User(); + $user = new User($this->storeRegistry); $user->setEmail('test@example.com'); $user->setName('Test'); $user->setIsAdmin(false); @@ -105,7 +112,7 @@ public function testExecute_GrantAdminStatus() public function testExecute_ChangesPasswordIfNotEmpty() { - $user = new User(); + $user = new User($this->storeRegistry); $user->setHash(password_hash('testing', PASSWORD_DEFAULT)); $user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'newpassword', false); @@ -115,7 +122,7 @@ public function testExecute_ChangesPasswordIfNotEmpty() public function testExecute_DoesNotChangePasswordIfEmpty() { - $user = new User(); + $user = new User($this->storeRegistry); $user->setHash(password_hash('testing', PASSWORD_DEFAULT)); $user = $this->testedService->updateUser($user, 'Test', 'test@example.com', '', false); From 0376ccadf655e01f655b1191f4d02f7dfaedb1f2 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 20 May 2021 23:35:37 +0700 Subject: [PATCH 010/212] Refactoring: Fixes. --- src/Application.php | 5 +-- src/BuildFactory.php | 2 +- src/Command/InstallCommand.php | 13 ++---- src/Controller/BuildController.php | 10 ++--- src/Controller/UserController.php | 2 +- src/Exception/RuntimeException.php | 17 ++++++++ src/Helper/Bitbucket.php | 17 ++++++++ src/Helper/BuildInterpolator.php | 3 +- src/Helper/MailerFactory.php | 6 +-- src/Http/Request.php | 3 +- src/Languages/lang.my.php | 1 - src/Logging/BuildDBLogHandler.php | 1 - src/Logging/Handler.php | 6 +-- src/Model/Build.php | 10 ++--- src/Model/Build/BitbucketBuild.php | 17 ++------ src/Model/Build/BitbucketHgBuild.php | 15 ++----- src/Model/Build/GithubBuild.php | 3 -- src/Model/Build/HgBuild.php | 14 +++++++ src/Model/Project.php | 7 +--- src/Plugin.php | 1 - src/Plugin/BitbucketNotify.php | 1 - src/Plugin/CampfireNotify.php | 1 - src/Plugin/EmailNotify.php | 1 - src/Plugin/HipchatNotify.php | 1 - src/Plugin/Mage.php | 3 +- src/Plugin/Mage3.php | 3 +- src/Plugin/Pdepend.php | 2 - src/Plugin/PhpCsFixer.php | 6 ++- src/Plugin/PhpMessDetector.php | 8 ++-- src/Plugin/SensiolabsInsight.php | 8 ++-- src/Plugin/SlackNotify.php | 1 - src/Plugin/Util/Executor.php | 3 -- src/Plugin/Util/Factory.php | 40 +------------------ src/Plugin/Util/PhpUnitResultJson.php | 2 - src/Plugin/Util/PhpUnitResultJunit.php | 2 +- src/Store.php | 3 +- src/Store/BuildErrorStore.php | 7 +--- src/Store/BuildMetaStore.php | 3 +- src/Store/BuildStore.php | 10 ++--- src/Store/ProjectStore.php | 3 +- src/View.php | 5 +-- src/View/Build/view.phtml | 1 - src/Worker/BuildWorker.php | 4 +- tests/src/Command/CreateAdminCommandTest.php | 3 +- tests/src/Command/CreateBuildCommandTest.php | 4 +- tests/src/Form/FormInputTest.php | 4 +- tests/src/Logging/BuildLogger2Test.php | 22 ---------- tests/src/Model/BuildTest.php | 2 +- tests/src/Plugin/EmailTest.php | 1 - .../src/Plugin/Option/PhpUnitOptionsTest.php | 2 +- tests/src/Plugin/Util/ExecutorTest.php | 30 +++++++++----- tests/src/Plugin/Util/FactoryTest.php | 3 +- 52 files changed, 132 insertions(+), 210 deletions(-) create mode 100644 src/Exception/RuntimeException.php delete mode 100644 tests/src/Logging/BuildLogger2Test.php diff --git a/src/Application.php b/src/Application.php index a7446ada4..841807fce 100644 --- a/src/Application.php +++ b/src/Application.php @@ -76,7 +76,7 @@ public function init() $skipAuth = [$this, 'shouldSkipAuth']; // Handler for the route we're about to register, checks for a valid session where necessary: - $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession, $skipAuth) { + $routeHandler = function ($route, Response &$response) use (&$request, $validateSession, $skipAuth) { $skipValidation = in_array($route['controller'], ['session', 'webhook', 'build-status']); if (!$skipValidation && !$validateSession() && (!is_callable($skipAuth) || !$skipAuth())) { @@ -274,8 +274,7 @@ protected function toPhpName($string) { $string = str_replace('-', ' ', $string); $string = ucwords($string); - $string = str_replace(' ', '', $string); - return $string; + return str_replace(' ', '', $string); } } diff --git a/src/BuildFactory.php b/src/BuildFactory.php index bf4e9d07c..7a508a5ab 100644 --- a/src/BuildFactory.php +++ b/src/BuildFactory.php @@ -91,7 +91,7 @@ public static function getBuild( $class = '\\PHPCensor\\Model\\Build\\' . $type; - if ($class instanceof Build\GitBuild) { + if ($class instanceof Build\GitBuild || $class instanceof Build\HgBuild) { $build = new $class($configuration, $storeRegistry, $build->getDataArray()); } else { $build = new $class($configuration, $build->getDataArray()); diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index a9ed36374..a99e7014b 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -134,7 +134,8 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->writeConfigFile($conf); } - $this->reloadConfig(); + $this->configuration = new Configuration($this->configPath); + if (!$this->setupDatabase($output)) { return false; } @@ -177,8 +178,7 @@ private function checkRequirements(OutputInterface $output) if (!(\version_compare(PHP_VERSION, '7.4.0') >= 0)) { $output->writeln(''); - $output->writeln( - 'PHP Censor requires at least PHP 7.4.0! Installed PHP ' . PHP_VERSION . ''); + $output->writeln('PHP Censor requires at least PHP 7.4.0! Installed PHP ' . PHP_VERSION . ''); $errors = true; } @@ -633,11 +633,4 @@ protected function createDefaultGroup(OutputInterface $output): void $output->writeln('' . $ex->getMessage() . ''); } } - - protected function reloadConfig(): void - { - if (\file_exists($this->configPath)) { - $config = new Configuration($this->configPath); - } - } } diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 71709de83..7cd057309 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -73,7 +73,7 @@ public function view($buildId) $plugin = $this->getParam('plugin', ''); $isNew = $this->getParam('is_new', ''); - $severity = $this->getParam('severity', null); + $severity = $this->getParam('severity'); if (null !== $severity && '' !== $severity) { $severity = (int)$severity; } else { @@ -388,10 +388,10 @@ public function ajaxData($buildId) { $page = (int)$this->getParam('page', 1); $perPage = (int)$this->getParam('per_page', 10); - $plugin = $this->getParam('plugin', null); - $isNew = $this->getParam('is_new', null); + $plugin = $this->getParam('plugin'); + $isNew = $this->getParam('is_new'); - $severity = $this->getParam('severity', null); + $severity = $this->getParam('severity'); if (null !== $severity && '' !== $severity) { $severity = (int)$severity; } else { @@ -444,7 +444,7 @@ public function ajaxMeta($buildId) (int)$buildId ); - $key = $this->getParam('key', null); + $key = $this->getParam('key'); $numBuilds = $this->getParam('num_builds', 1); $data = null; diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 5052f6b83..dbc6b0de9 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -220,7 +220,7 @@ public function edit($userId) $method = $this->request->getMethod(); $user = $this->userStore->getById($userId); - if (!$currentUser->getIsAdmin() && $currentUser != $user) { + if (!$currentUser->getIsAdmin() && $currentUser !== $user) { throw new ForbiddenException('You do not have permission to do that.'); } diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php new file mode 100644 index 000000000..724713fd2 --- /dev/null +++ b/src/Exception/RuntimeException.php @@ -0,0 +1,17 @@ + + */ +class RuntimeException extends Exception +{ +} diff --git a/src/Helper/Bitbucket.php b/src/Helper/Bitbucket.php index e80d769cb..04811f5cd 100644 --- a/src/Helper/Bitbucket.php +++ b/src/Helper/Bitbucket.php @@ -4,6 +4,7 @@ use GuzzleHttp\Client; use PHPCensor\ConfigurationInterface; +use PHPCensor\Model\Build; /** * The Bitbucket Helper class provides some Bitbucket API call functionality. @@ -124,4 +125,20 @@ public function getPullRequestDiff($repo, $pullRequestId) return (string)$response->getBody(); } + + public function getFileLinkTemplate(Build $build): string + { + $reference = $build->getProject()->getReference(); + if (\in_array($build->getSource(), Build::$pullRequestSources, true)) { + $reference = $build->getExtra('remote_reference'); + } + + $link = 'https://bitbucket.org/' . $reference . '/'; + + $link .= 'src/' . $build->getCommitId() . '/'; + $link .= '{FILE}'; + $link .= '#{BASEFILE}-{LINE}'; + + return $link; + } } diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index e932e3bc7..7643c65c6 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -97,9 +97,8 @@ private function realtimeInterpolate($input) { $input = str_replace('%CURRENT_DATE%', \date('Y-m-d'), $input); $input = str_replace('%CURRENT_TIME%', \date('H-i-s'), $input); - $input = str_replace('%CURRENT_DATETIME%', \date('Y-m-d_H-i-s'), $input); - return $input; + return str_replace('%CURRENT_DATETIME%', \date('Y-m-d_H-i-s'), $input); } /** diff --git a/src/Helper/MailerFactory.php b/src/Helper/MailerFactory.php index b774417e4..1ee2f6947 100644 --- a/src/Helper/MailerFactory.php +++ b/src/Helper/MailerFactory.php @@ -68,14 +68,12 @@ public function getMailConfig($configName) return $this->emailConfig[$configName]; } else { switch ($configName) { - case 'smtp_address': - return ''; case 'default_mailto_address': + case 'smtp_encryption': return null; case 'smtp_port': return '25'; - case 'smtp_encryption': - return null; + case 'smtp_address': default: return ''; } diff --git a/src/Http/Request.php b/src/Http/Request.php index 69a3c04a2..60b7efcbd 100644 --- a/src/Http/Request.php +++ b/src/Http/Request.php @@ -44,9 +44,8 @@ protected function getRequestPath() // Also cut out the query string: $path = explode('?', $path); - $path = array_shift($path); - return $path; + return array_shift($path); } /** diff --git a/src/Languages/lang.my.php b/src/Languages/lang.my.php index 2d8205437..d8db7cdf5 100644 --- a/src/Languages/lang.my.php +++ b/src/Languages/lang.my.php @@ -86,7 +86,6 @@ 'success' => 'Success', 'failed' => 'gagal', 'failed_allowed' => 'Gagal (Dibolehkan)', - 'error' => 'Error', 'skipped' => 'Dilangkau', 'trace' => 'Stack trace', 'manual_build' => 'Build Manual', diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index 6c01b7311..c243c67c2 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -6,7 +6,6 @@ use Monolog\Logger; use PHPCensor\Model\Build; use PHPCensor\Store\BuildStore; -use Psr\Log\LogLevel; /** * Class BuildDBLogHandler writes the build log to the database. diff --git a/src/Logging/Handler.php b/src/Logging/Handler.php index e2e6ce34c..b1ed6ad7d 100644 --- a/src/Logging/Handler.php +++ b/src/Logging/Handler.php @@ -81,12 +81,12 @@ public function handleError($level, $message, $file, $line) */ public function handleFatalError() { - $fatalError = error_get_last(); + $fatalError = \error_get_last(); try { - if (($error = error_get_last()) !== null) { + if (\error_get_last() !== null) { $error = new ErrorException( - sprintf( + \sprintf( '%s: %s in %s line %d', $fatalError['type'], $fatalError['message'], diff --git a/src/Model/Build.php b/src/Model/Build.php index add7fba52..688cdb155 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -35,7 +35,7 @@ class Build extends BaseBuild /** * @var array */ - public static $pullRequestSources = [ + public static array $pullRequestSources = [ self::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, self::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, self::SOURCE_WEBHOOK_PULL_REQUEST_APPROVED, @@ -45,7 +45,7 @@ class Build extends BaseBuild /** * @var array */ - public static $webhookSources = [ + public static array $webhookSources = [ self::SOURCE_WEBHOOK_PUSH, self::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, self::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, @@ -263,7 +263,7 @@ protected function handleConfig(Builder $builder, $buildPath) $overwriteBuildConfig = $this->getProject()->getOverwriteBuildConfig(); $buildConfig = $builder->getConfig(); - $repositoryConfig = $this->getZeroConfigPlugins($builder); + $repositoryConfig = $this->getZeroConfigPlugins(); $repositoryConfigFrom = ''; if (file_exists($buildPath . '/.php-censor.yml')) { @@ -308,13 +308,11 @@ protected function handleConfig(Builder $builder, $buildPath) /** * Get an array of plugins to run if there's no .php-censor.yml file. * - * @param Builder $builder - * * @return array * * @throws ReflectionException */ - protected function getZeroConfigPlugins(Builder $builder) + protected function getZeroConfigPlugins() { $pluginDir = SRC_DIR . 'Plugin/'; $dir = new DirectoryIterator($pluginDir); diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 617484558..152671fb8 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -174,22 +174,13 @@ protected function getCloneUrl() /** * Get a template to use for generating links to files. * - * @return string|null + * @return string */ public function getFileLinkTemplate() { - $reference = $this->getProject()->getReference(); - - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { - $reference = $this->getExtra('remote_reference'); - } + $bitbucket = new Bitbucket($this->configuration); - $link = 'https://bitbucket.org/' . $reference . '/'; - $link .= 'src/' . $this->getCommitId() . '/'; - $link .= '{FILE}'; - $link .= '#{BASEFILE}-{LINE}'; - - return $link; + return $bitbucket->getFileLinkTemplate($this); } /** @@ -297,8 +288,6 @@ public function reportError( } } catch (\Throwable $e) { $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); - } catch (\Exception $e) { - $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); } } diff --git a/src/Model/Build/BitbucketHgBuild.php b/src/Model/Build/BitbucketHgBuild.php index 0ccdc0320..b23846c44 100644 --- a/src/Model/Build/BitbucketHgBuild.php +++ b/src/Model/Build/BitbucketHgBuild.php @@ -2,7 +2,7 @@ namespace PHPCensor\Model\Build; -use PHPCensor\Model\Build; +use PHPCensor\Helper\Bitbucket; /** * BitbucketHgBuild Build Model @@ -77,17 +77,8 @@ protected function getCloneUrl() */ public function getFileLinkTemplate() { - $reference = $this->getProject()->getReference(); + $bitbucket = new Bitbucket($this->configuration); - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { - $reference = $this->getExtra('remote_reference'); - } - - $link = 'https://bitbucket.org/' . $reference . '/'; - $link .= 'src/' . $this->getCommitId() . '/'; - $link .= '{FILE}'; - $link .= '#{BASEFILE}-{LINE}'; - - return $link; + return $bitbucket->getFileLinkTemplate($this); } } diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 9fb5192a8..ff3d500e7 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -5,7 +5,6 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Configuration; use PHPCensor\Helper\Diff; use PHPCensor\Helper\Github; use PHPCensor\Model\Build; @@ -309,8 +308,6 @@ public function reportError( } } catch (\Throwable $e) { $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); - } catch (\Exception $e) { - $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); } } diff --git a/src/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php index fd97c0d60..d49600073 100644 --- a/src/Model/Build/HgBuild.php +++ b/src/Model/Build/HgBuild.php @@ -4,7 +4,9 @@ use Exception; use PHPCensor\Builder; +use PHPCensor\ConfigurationInterface; use PHPCensor\Model\Build; +use PHPCensor\StoreRegistry; /** * Mercurial Build Model @@ -13,6 +15,18 @@ */ class HgBuild extends Build { + protected ConfigurationInterface $configuration; + + public function __construct( + ConfigurationInterface $configuration, + StoreRegistry $storeRegistry, + array $initialData = [] + ) { + parent::__construct($storeRegistry, $initialData); + + $this->configuration = $configuration; + } + /** * Get the URL to be used to clone this remote repository. * diff --git a/src/Model/Project.php b/src/Model/Project.php index 92fbe2ade..a5c10e52d 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -135,9 +135,7 @@ public function getIcon() */ protected function getEnvironmentStore() { - /** @var EnvironmentStore $store */ - $store = $this->storeRegistry->get('Environment'); - return $store; + return $this->storeRegistry->get('Environment'); } /** @@ -188,9 +186,8 @@ public function getEnvironments() } $yamlDumper = new YamlDumper(); - $value = $yamlDumper->dump($environmentsConfig, 10, 0, true, false); - return $value; + return $yamlDumper->dump($environmentsConfig, 10, 0); } /** diff --git a/src/Plugin.php b/src/Plugin.php index f778587ac..7e2c43ac6 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -4,7 +4,6 @@ use Exception; use PHPCensor\Model\Build; -use PHPCensor\Plugin\Codeception; /** * @author Dan Cryer diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index b70bdf4a2..21520e657 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -286,7 +286,6 @@ public function getPhpUnitCoverage($targetBranch) /** @var BuildMetaStore $buildMetaStore */ $buildMetaStore = $this->storeRegistry->get('BuildMeta'); $latestTargetBuildId = $this->findLatestBuild($targetBranch); - $latestCurrentBuildId = $this->findLatestBuild($this->build->getBranch()); $targetMetaData = $buildMetaStore->getByKey( $this->findLatestBuild($targetBranch), diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index 12bdd38ea..fc1c97fcb 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -2,7 +2,6 @@ namespace PHPCensor\Plugin; -use Exception; use PHPCensor\Builder; use PHPCensor\Exception\InvalidArgumentException; use PHPCensor\Model\Build; diff --git a/src/Plugin/EmailNotify.php b/src/Plugin/EmailNotify.php index caec69c51..b0ce96268 100644 --- a/src/Plugin/EmailNotify.php +++ b/src/Plugin/EmailNotify.php @@ -2,7 +2,6 @@ namespace PHPCensor\Plugin; -use PHPCensor\Configuration; use PHPCensor\Exception\HttpException; use PHPCensor\Helper\Email as EmailHelper; use PHPCensor\Plugin; diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index 268b4f2c7..e1f322f00 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -2,7 +2,6 @@ namespace PHPCensor\Plugin; -use Exception; use HipChat\HipChat; use PHPCensor\Builder; use PHPCensor\Exception\InvalidArgumentException; diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index efabe8af6..619982c7d 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -107,8 +107,7 @@ protected function getMageLog() $lines = explode("\n", $logContent); $lines = array_map('trim', $lines); - $lines = array_filter($lines); - return $lines; + return array_filter($lines); } } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index cff72e112..c43b3aa89 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -112,8 +112,7 @@ protected function getMageLog() $lines = explode("\n", $logContent); $lines = array_map('trim', $lines); - $lines = array_filter($lines); - return $lines; + return array_filter($lines); } } diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index cab18f007..72469839f 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -2,9 +2,7 @@ namespace PHPCensor\Plugin; -use Exception; use PHPCensor\Builder; -use PHPCensor\Configuration; use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index 030b3a2ba..040912922 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -119,8 +119,10 @@ public function execute() $phpCsFixer = $this->executable; // Determine the version of PHP CS Fixer - $cmd = $phpCsFixer . ' --version'; - $success = $this->builder->executeCommand($cmd); + $cmd = $phpCsFixer . ' --version'; + + $this->builder->executeCommand($cmd); + $output = $this->builder->getLastOutput(); $matches = []; if (preg_match('/(\d+\.\d+\.\d+)/', $output, $matches)) { diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index dc1ff08dc..e0a155cb8 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -218,12 +218,10 @@ protected function executePhpMd($binaryPath) */ protected function wasLastExecSuccessful($errorCount) { - $success = true; - if (-1 != $this->allowedWarnings && $errorCount > $this->allowedWarnings) { - $success = false; - return $success; + return false; } - return $success; + + return true; } } diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index 62321cc4e..4b593d101 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -167,12 +167,10 @@ protected function executeSensiolabsInsight($binaryPath) */ protected function wasLastExecSuccessful($errorCount) { - $success = true; - if ($this->allowedWarnings !== -1 && $errorCount > $this->allowedWarnings) { - $success = false; - return $success; + return false; } - return $success; + + return true; } } diff --git a/src/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php index 200e60fe3..86554b195 100644 --- a/src/Plugin/SlackNotify.php +++ b/src/Plugin/SlackNotify.php @@ -2,7 +2,6 @@ namespace PHPCensor\Plugin; -use Exception; use Maknz\Slack\Attachment; use Maknz\Slack\AttachmentField; use Maknz\Slack\Client; diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 17e16ba49..3816c4484 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -143,9 +143,6 @@ protected function getBranchSpecificPlugins($config, $stage, $pluginsToExecute) // Run branch-specific plugins after standard plugins: case 'after': - array_push($pluginsToExecute, $plugins); - break; - default: array_push($pluginsToExecute, $plugins); break; diff --git a/src/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php index cffe6c7c3..c73687d0e 100644 --- a/src/Plugin/Util/Factory.php +++ b/src/Plugin/Util/Factory.php @@ -16,11 +16,8 @@ */ class Factory { - const TYPE_ARRAY = "array"; - const TYPE_CALLABLE = "callable"; - const INTERFACE_PLUGIN = '\PHPCensor\Plugin'; - - private $currentPluginOptions; + const TYPE_ARRAY = "array"; + const TYPE_CALLABLE = "callable"; /** * @var Container @@ -39,37 +36,6 @@ public function __construct(Container $container = null) } } - /** - * Trys to get a function from the file path specified. If the - * file returns a function then $this will be passed to it. - * This enables the config file to call any public methods. - * - * @param $configPath - * @return bool - true if the function exists else false. - */ - public function addConfigFromFile($configPath) - { - // The file is expected to return a function which can - // act on the pluginFactory to register any resources needed. - if (file_exists($configPath)) { - $configFunction = require($configPath); - if (is_callable($configFunction)) { - $configFunction($this); - return true; - } - } - return false; - } - - /** - * Get most recently used factory options. - * @return mixed - */ - public function getLastOptions() - { - return $this->currentPluginOptions; - } - /** * Builds an instance of plugin of class $className. $options will * be passed along with any resources registered with the factory. @@ -81,8 +47,6 @@ public function getLastOptions() */ public function buildPlugin($className, $options = []) { - $this->currentPluginOptions = $options; - $reflectedPlugin = new ReflectionClass($className); $constructor = $reflectedPlugin->getConstructor(); diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index cacf3c5c0..3c56b44c5 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -88,8 +88,6 @@ protected function getSeverity($event) } break; case 'pass': - $severity = self::SEVERITY_PASS; - break; case 'warning': $severity = self::SEVERITY_PASS; break; diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index a45364b64..21916736b 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -87,7 +87,7 @@ protected function buildMessage($testCase) } if ('' === $msg) { $msg = $testCase['class'].'::'.$testCase['name']; - }; + } $testCase['_tracePos'] = $tracePos; // will be converted to string return $msg; diff --git a/src/Store.php b/src/Store.php index 074b2625f..80d96e987 100644 --- a/src/Store.php +++ b/src/Store.php @@ -151,8 +151,7 @@ public function save(Model $obj, $saveAllColumns = false) */ public function saveByUpdate(Model $obj, $saveAllColumns = false) { - $rtn = null; - $data = $obj->getDataArray(); + $data = $obj->getDataArray(); $modified = ($saveAllColumns) ? array_keys($data) : $obj->getModified(); $updates = []; diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 870c6658a..4e3cc5a67 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -223,9 +223,7 @@ public function getKnownPlugins($buildId, $severity = null, $isNew = '') $map = function ($item) { return $item['plugin']; }; - $rtn = array_map($map, $res); - - return $rtn; + return array_map($map, $res); } else { return []; } @@ -264,9 +262,8 @@ public function getKnownSeverities($buildId, $plugin = '', $isNew = '') $map = function ($item) { return (int)$item['severity']; }; - $rtn = array_map($map, $res); - return $rtn; + return array_map($map, $res); } else { return []; } diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 351faab9a..9b2e38f9b 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -159,9 +159,8 @@ public function getErrorsForUpgrade($limit) $map = function ($item) { return new BuildMeta($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); - return $rtn; + return array_map($map, $res); } else { return []; } diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 593abc8dd..b5b73cf0d 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -167,9 +167,8 @@ public function getBuilds($limit = 5, $offset = 0) $map = function ($item) { return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); - return $rtn; + return array_map($map, $res); } else { return []; } @@ -230,9 +229,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) $map = function ($item) { return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); - - return $rtn; + return array_map($map, $res); } else { return []; } @@ -399,8 +396,7 @@ public function getBuildBranches($projectId) $stmt->bindValue(':project_id', $projectId); if ($stmt->execute()) { - $res = $stmt->fetchAll(PDO::FETCH_COLUMN); - return $res; + return $stmt->fetchAll(PDO::FETCH_COLUMN); } else { return []; } diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 0dc6912ff..4979fb829 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -157,9 +157,8 @@ public function getKnownBranches($projectId) $map = function ($item) { return $item['branch']; }; - $rtn = array_map($map, $res); - return $rtn; + return array_map($map, $res); } else { return []; } diff --git a/src/View.php b/src/View.php index acd2107b1..986659825 100644 --- a/src/View.php +++ b/src/View.php @@ -3,8 +3,6 @@ namespace PHPCensor; use PHPCensor\Exception\RuntimeException; -use PHPCensor\Model\User; -use PHPCensor\Store\UserStore; class View { @@ -45,9 +43,8 @@ public function __construct($file, $path = null) protected static function getViewFile($file, $path = null) { $viewPath = is_null($path) ? (SRC_DIR . 'View/') : $path; - $fullPath = $viewPath . $file . '.' . static::$extension; - return $fullPath; + return $viewPath . $file . '.' . static::$extension; } /** diff --git a/src/View/Build/view.phtml b/src/View/Build/view.phtml index c5dd67453..aaa4df65e 100644 --- a/src/View/Build/view.phtml +++ b/src/View/Build/view.phtml @@ -5,7 +5,6 @@ use PHPCensor\Helper\Template; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Model\Environment; -use PHPCensor\Store\EnvironmentStore; /** * @var Build $build diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 5036cc072..3550f4c3b 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -93,8 +93,6 @@ protected function runWorker() { $this->pheanstalk->watchOnly($this->queueTube); - $buildStore = $this->storeRegistry->get('Build'); - while ($this->canRun) { if ($this->canPeriodicalWork && $this->canRunPeriodicalWork()) { @@ -224,7 +222,7 @@ protected function deleteJob(Job $job) protected function canForceRewindLoop() { try { - $peekedJob = $this->pheanstalk->peekReady($this->queueTube); + $this->pheanstalk->peekReady($this->queueTube); } catch (Exception $e) { return true; } diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index ca4e75d7a..c2fdc3f53 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -71,9 +71,8 @@ protected function getCommandTester() { $this->application->getHelperSet()->set($this->helper, 'question'); $this->application->add($this->command); - $commandTester = new CommandTester($this->command); - return $commandTester; + return new CommandTester($this->command); } public function testExecute() diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 8c22d5251..81b365e02 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -79,11 +79,9 @@ protected function setUp(): void protected function getCommandTester() { $this->application->add($this->command); - $command = $this->application->find('php-censor:create-build'); - $commandTester = new CommandTester($command); - return $commandTester; + return new CommandTester($command); } public function testExecute() diff --git a/tests/src/Form/FormInputTest.php b/tests/src/Form/FormInputTest.php index e8e8a5345..1ec77da34 100644 --- a/tests/src/Form/FormInputTest.php +++ b/tests/src/Form/FormInputTest.php @@ -25,7 +25,9 @@ protected function tearDown() : void public function testValidatorSetterGetterSuccess() { - $validator = function ($value) { echo $value;}; + $validator = function ($value) { + echo $value; + }; $this->inputElement->setValidator($validator); $this->assertEquals($validator, $this->inputElement->getValidator()); } diff --git a/tests/src/Logging/BuildLogger2Test.php b/tests/src/Logging/BuildLogger2Test.php deleted file mode 100644 index 2265a3960..000000000 --- a/tests/src/Logging/BuildLogger2Test.php +++ /dev/null @@ -1,22 +0,0 @@ -createMock(LoggerInterface::class); - $build = $this->createMock(Build::class); - - $buildLogger = new BuildLogger($logger, $build); - } -} diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index 231a04a32..dbc7615bc 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -67,7 +67,7 @@ public function testConstruct() ], $build->getDataArray()); try { - $build = new Build($this->storeRegistry, [ + new Build($this->storeRegistry, [ 'project_id' => 101, 'branch' => 'dev', 'unknown' => 'unknown', diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index dbb102e2d..e67d98a9c 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -2,7 +2,6 @@ namespace Tests\PHPCensor\Plugin; -use PHPCensor\Configuration; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/tests/src/Plugin/Option/PhpUnitOptionsTest.php b/tests/src/Plugin/Option/PhpUnitOptionsTest.php index 353dc1b80..a989dc7e2 100644 --- a/tests/src/Plugin/Option/PhpUnitOptionsTest.php +++ b/tests/src/Plugin/Option/PhpUnitOptionsTest.php @@ -122,7 +122,7 @@ public function testGetters() self::assertEquals('/path/to/run/from', $options->getRunFrom()); self::assertEquals('subTest', $options->getTestsPath()); self::assertNull($options->getOption('random')); - self::assertEmpty($options->getDirectories($builder)); + self::assertEmpty($options->getDirectories()); self::assertEmpty($options->getConfigFiles()); $files = $options->getConfigFiles(ROOT_DIR); diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index bf2ede5ad..50de183f6 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -2,13 +2,13 @@ namespace Tests\PHPCensor\Plugin\Util; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin\Util\Executor; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; -use RuntimeException; class ExecutorTest extends TestCase { @@ -93,6 +93,7 @@ public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin() $build = new Build($this->storeRegistry); $mockPlugin = $this->prophesize('PHPCensor\Plugin'); + $mockPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $mockPlugin->execute()->shouldBeCalledTimes(1); $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal()); @@ -109,6 +110,7 @@ public function testExecutePlugin_ReturnsPluginSuccess() $expectedReturnValue = true; $mockPlugin = $this->prophesize('PHPCensor\Plugin'); + $mockPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $mockPlugin->execute()->willReturn($expectedReturnValue); $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal()); @@ -136,12 +138,14 @@ public function testExecutePlugin_LogsFailureWhenExceptionsAreThrownByPlugin() $expectedException = new RuntimeException("Generic Error"); $mockPlugin = $this->prophesize('PHPCensor\Plugin'); + $mockPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $mockPlugin->execute()->willThrow($expectedException); $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal()); - $this->mockBuildLogger->logFailure('Exception: ' . $expectedException->getMessage(), $expectedException) - ->shouldBeCalledTimes(1); + $this->mockBuildLogger + ->logFailure('Exception: ' . $expectedException->getMessage(), $expectedException) + ->shouldBeCalledTimes(1); $this->testedExecutor->executePlugin($pluginName, $options); } @@ -153,26 +157,30 @@ public function testExecutePlugins_CallsEachPluginForStage() $build = new Build($this->storeRegistry); $config = [ - 'stageOne' => [ - 'PhpUnit' => $phpUnitPluginOptions, - 'Behat' => $behatPluginOptions, - ] + 'stageOne' => [ + 'PhpUnit' => $phpUnitPluginOptions, + 'Behat' => $behatPluginOptions, + ] ]; $pluginNamespace = 'PHPCensor\\Plugin\\'; $mockPhpUnitPlugin = $this->prophesize('PHPCensor\Plugin'); + $mockPhpUnitPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $mockPhpUnitPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true); - $this->mockFactory->buildPlugin($pluginNamespace . 'PhpUnit', $phpUnitPluginOptions) - ->willReturn($mockPhpUnitPlugin->reveal()); + $this->mockFactory + ->buildPlugin($pluginNamespace . 'PhpUnit', $phpUnitPluginOptions) + ->willReturn($mockPhpUnitPlugin->reveal()); $this->mockFactory->getResourceFor('PHPCensor\Model\Build')->willReturn($build); $mockBehatPlugin = $this->prophesize('PHPCensor\Plugin'); + $mockBehatPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $mockBehatPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true); - $this->mockFactory->buildPlugin($pluginNamespace . 'Behat', $behatPluginOptions) - ->willReturn($mockBehatPlugin->reveal()); + $this->mockFactory + ->buildPlugin($pluginNamespace . 'Behat', $behatPluginOptions) + ->willReturn($mockBehatPlugin->reveal()); $this->testedExecutor->executePlugins($config, 'stageOne'); } diff --git a/tests/src/Plugin/Util/FactoryTest.php b/tests/src/Plugin/Util/FactoryTest.php index 7f80c8d95..9c7d4c4d2 100644 --- a/tests/src/Plugin/Util/FactoryTest.php +++ b/tests/src/Plugin/Util/FactoryTest.php @@ -2,6 +2,7 @@ namespace Tests\PHPCensor\Plugin\Util; +use PHPCensor\Exception\RuntimeException; use PHPCensor\Plugin\Util\Factory; use PHPUnit\Framework\TestCase; use stdClass; @@ -61,7 +62,7 @@ public function testBuildPluginWorksWithSingleOptionalArgConstructor() public function testBuildPluginThrowsExceptionIfMissingResourcesForRequiredArg() { - self::expectException('\DomainException'); + self::expectException(RuntimeException::class); self::expectExceptionMessage('Unsatisfied dependency: requiredArgument'); $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg'); From dcfbff2beeaed8a16494676a8b8c0bb326824261 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 24 May 2021 22:40:30 +0700 Subject: [PATCH 011/212] Refactoring: Exception types +. --- composer.lock | 323 +++++++++--------- src/Builder.php | 10 +- src/Command/Action/CreateAdmin.php | 4 +- src/Command/CreateBuildCommand.php | 2 +- src/Command/InstallCommand.php | 4 +- src/Command/WorkerCommand.php | 4 +- src/Console/Application.php | 2 +- src/Controller/BuildStatusController.php | 2 +- src/Controller/ProjectController.php | 2 +- src/Controller/WebhookController.php | 4 +- src/DatabaseManager.php | 2 +- src/Exception/InvalidArgumentException.php | 15 - src/Exception/LogicException.php | 17 - src/Exception/RuntimeException.php | 17 - src/Form/Validator/Yaml.php | 2 +- src/Helper/CommandExecutor.php | 2 +- src/Http/Router.php | 2 +- .../20200505070903_initial_migration_v2.php | 2 +- src/Model/Base/Build.php | 2 +- src/Model/Base/Project.php | 2 +- src/Model/Build.php | 2 +- src/Model/Build/BitbucketServerBuild.php | 2 +- src/Plugin/BitbucketNotify.php | 2 +- src/Plugin/CampfireNotify.php | 2 +- src/Plugin/Codeception.php | 2 +- src/Plugin/CopyBuild.php | 2 +- src/Plugin/EmailNotify.php | 2 +- src/Plugin/FlowdockNotify.php | 4 +- src/Plugin/HipchatNotify.php | 2 +- src/Plugin/Mage.php | 2 +- src/Plugin/Mage3.php | 2 +- src/Plugin/Mysql.php | 4 +- src/Plugin/Pdepend.php | 2 +- src/Plugin/Phan.php | 2 +- src/Plugin/Phing.php | 2 +- src/Plugin/PhpCodeSniffer.php | 2 +- src/Plugin/PhpCpd.php | 2 +- src/Plugin/PhpCsFixer.php | 2 +- src/Plugin/PhpMessDetector.php | 2 +- src/Plugin/PhpUnit.php | 2 +- src/Plugin/SecurityChecker.php | 2 +- src/Plugin/SensiolabsInsight.php | 2 +- src/Plugin/SlackNotify.php | 2 +- src/Plugin/TelegramNotify.php | 2 +- src/Plugin/Util/Executor.php | 2 +- src/Plugin/Util/Factory.php | 4 +- src/Plugin/Util/PhpUnitResultJson.php | 2 +- src/Plugin/Util/PhpUnitResultJunit.php | 2 +- src/Plugin/WebhookNotify.php | 2 +- src/Store.php | 4 +- src/View.php | 2 +- tests/src/Command/CreateBuildCommandTest.php | 2 +- tests/src/FormTest.php | 2 +- tests/src/Model/Base/BuildTest.php | 6 +- tests/src/Model/Base/ProjectTest.php | 2 +- tests/src/Model/BuildTest.php | 2 +- tests/src/Model/ProjectTest.php | 2 +- tests/src/Plugin/Util/ExecutorTest.php | 2 +- tests/src/Plugin/Util/FactoryTest.php | 6 +- 59 files changed, 232 insertions(+), 282 deletions(-) delete mode 100644 src/Exception/InvalidArgumentException.php delete mode 100644 src/Exception/LogicException.php delete mode 100644 src/Exception/RuntimeException.php diff --git a/composer.lock b/composer.lock index 5c279927c..6d028e553 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.2.5", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -65,16 +65,16 @@ }, { "name": "cakephp/database", - "version": "4.2.5", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "b2935208a9b15318a2dd497010ff28c2b73cdd2d" + "reference": "e029c0e5cbea35b2cd4c742f9d16241588594cd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/b2935208a9b15318a2dd497010ff28c2b73cdd2d", - "reference": "b2935208a9b15318a2dd497010ff28c2b73cdd2d", + "url": "https://api.github.com/repos/cakephp/database/zipball/e029c0e5cbea35b2cd4c742f9d16241588594cd8", + "reference": "e029c0e5cbea35b2cd4c742f9d16241588594cd8", "shasum": "" }, "require": { @@ -116,20 +116,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2021-03-29T16:51:56+00:00" + "time": "2021-04-07T13:24:04+00:00" }, { "name": "cakephp/datasource", - "version": "4.2.5", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "47aaa8b796dce35e2fe2547db4f8eb591220acd8" + "reference": "2e9805d1c5c78be6916db4ccc45e49f3ff5e5407" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/47aaa8b796dce35e2fe2547db4f8eb591220acd8", - "reference": "47aaa8b796dce35e2fe2547db4f8eb591220acd8", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/2e9805d1c5c78be6916db4ccc45e49f3ff5e5407", + "reference": "2e9805d1c5c78be6916db4ccc45e49f3ff5e5407", "shasum": "" }, "require": { @@ -174,11 +174,11 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2021-03-29T16:51:56+00:00" + "time": "2021-04-07T13:24:04+00:00" }, { "name": "cakephp/utility", - "version": "4.2.5", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", @@ -511,16 +511,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" + "reference": "dc960a912984efb74d0a90222870c72c87f10c91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91", "shasum": "" }, "require": { @@ -580,9 +580,9 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.1" + "source": "https://github.com/guzzle/psr7/tree/1.8.2" }, - "time": "2021-03-21T16:25:00+00:00" + "time": "2021-04-26T09:17:50+00:00" }, { "name": "hipchat/hipchat-php", @@ -889,12 +889,12 @@ "source": { "type": "git", "url": "https://github.com/php-censor/common.git", - "reference": "6b36aa2e5e95a18aab130611e209f81f48a3ae28" + "reference": "a8ba554ee7b40b6820e7d338b6c1e90a12c3af12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/common/zipball/6b36aa2e5e95a18aab130611e209f81f48a3ae28", - "reference": "6b36aa2e5e95a18aab130611e209f81f48a3ae28", + "url": "https://api.github.com/repos/php-censor/common/zipball/a8ba554ee7b40b6820e7d338b6c1e90a12c3af12", + "reference": "a8ba554ee7b40b6820e7d338b6c1e90a12c3af12", "shasum": "" }, "require": { @@ -948,7 +948,7 @@ "issues": "https://github.com/php-censor/common/issues", "source": "https://github.com/php-censor/common" }, - "time": "2021-04-25T06:46:27+00:00" + "time": "2021-05-18T15:43:39+00:00" }, { "name": "php-censor/flowdock-client", @@ -1213,16 +1213,16 @@ }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -1246,7 +1246,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -1257,9 +1257,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "psr/simple-cache", @@ -1358,22 +1358,22 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.6", + "version": "0.12.7", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "3519c5c8d36ec9d41915a9416d2d434adaa79690" + "reference": "bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/3519c5c8d36ec9d41915a9416d2d434adaa79690", - "reference": "3519c5c8d36ec9d41915a9416d2d434adaa79690", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2", + "reference": "bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2", "shasum": "" }, "require": { "cakephp/database": "^4.0", "php": ">=7.2", - "psr/container": "^1.0", + "psr/container": "^1.0 || ^2.0", "symfony/config": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0|^5.0" }, @@ -1438,9 +1438,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.6" + "source": "https://github.com/cakephp/phinx/tree/0.12.7" }, - "time": "2021-02-23T09:52:59+00:00" + "time": "2021-04-16T14:27:37+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -1573,16 +1573,16 @@ }, { "name": "symfony/browser-kit", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "cfa8d92f95294747e3abc04969efee51ed374424" + "reference": "7e6a92d5d97d826830924bd8cd22daa452c9e467" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/cfa8d92f95294747e3abc04969efee51ed374424", - "reference": "cfa8d92f95294747e3abc04969efee51ed374424", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/7e6a92d5d97d826830924bd8cd22daa452c9e467", + "reference": "7e6a92d5d97d826830924bd8cd22daa452c9e467", "shasum": "" }, "require": { @@ -1624,7 +1624,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v4.4.20" + "source": "https://github.com/symfony/browser-kit/tree/v4.4.24" }, "funding": [ { @@ -1640,20 +1640,20 @@ "type": "tidelift" } ], - "time": "2021-02-18T10:52:56+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/cache", - "version": "v4.4.21", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "b7ff54be3f3eb1ce09643692f0c309b1b27bc992" + "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/b7ff54be3f3eb1ce09643692f0c309b1b27bc992", - "reference": "b7ff54be3f3eb1ce09643692f0c309b1b27bc992", + "url": "https://api.github.com/repos/symfony/cache/zipball/9084b7312c3de1e6d621d60e00c5d42a4b77cfee", + "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee", "shasum": "" }, "require": { @@ -1677,7 +1677,7 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/cache": "^1.6", + "doctrine/cache": "^1.6|^2.0", "doctrine/dbal": "^2.6|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", @@ -1717,7 +1717,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.21" + "source": "https://github.com/symfony/cache/tree/v4.4.24" }, "funding": [ { @@ -1733,7 +1733,7 @@ "type": "tidelift" } ], - "time": "2021-03-14T19:28:18+00:00" + "time": "2021-05-16T21:41:25+00:00" }, { "name": "symfony/cache-contracts", @@ -1816,16 +1816,16 @@ }, { "name": "symfony/config", - "version": "v4.4.20", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "98606c6fa1a8f55ff964ccdd704275bf5b9f71b3" + "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/98606c6fa1a8f55ff964ccdd704275bf5b9f71b3", - "reference": "98606c6fa1a8f55ff964ccdd704275bf5b9f71b3", + "url": "https://api.github.com/repos/symfony/config/zipball/be9e601f17fc684ddfd6c675fdfcd04bb51fa928", + "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928", "shasum": "" }, "require": { @@ -1872,7 +1872,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.20" + "source": "https://github.com/symfony/config/tree/v4.4.23" }, "funding": [ { @@ -1888,20 +1888,20 @@ "type": "tidelift" } ], - "time": "2021-02-22T15:36:50+00:00" + "time": "2021-05-07T13:37:51+00:00" }, { "name": "symfony/console", - "version": "v4.4.21", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23" + "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", - "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", + "url": "https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d", + "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d", "shasum": "" }, "require": { @@ -1961,7 +1961,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.21" + "source": "https://github.com/symfony/console/tree/v4.4.24" }, "funding": [ { @@ -1977,20 +1977,20 @@ "type": "tidelift" } ], - "time": "2021-03-26T09:23:24+00:00" + "time": "2021-05-13T06:28:07+00:00" }, { "name": "symfony/css-selector", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8" + "reference": "947cacaf1b3a2af6f13a435392873d5ddaba5f70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8", - "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70", + "reference": "947cacaf1b3a2af6f13a435392873d5ddaba5f70", "shasum": "" }, "require": { @@ -2026,7 +2026,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v4.4.20" + "source": "https://github.com/symfony/css-selector/tree/v4.4.24" }, "funding": [ { @@ -2042,20 +2042,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.21", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "b5f97557faa48ead4671bc311cfca423d476e93e" + "reference": "8422396fb0b477ecbbe130907f90a0809b49c835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b5f97557faa48ead4671bc311cfca423d476e93e", - "reference": "b5f97557faa48ead4671bc311cfca423d476e93e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8422396fb0b477ecbbe130907f90a0809b49c835", + "reference": "8422396fb0b477ecbbe130907f90a0809b49c835", "shasum": "" }, "require": { @@ -2076,7 +2076,7 @@ "require-dev": { "symfony/config": "^4.3", "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "symfony/config": "", @@ -2111,7 +2111,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.21" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.24" }, "funding": [ { @@ -2127,20 +2127,20 @@ "type": "tidelift" } ], - "time": "2021-03-05T18:16:26+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "be133557f1b0e6672367325b508e65da5513a311" + "reference": "fc0bd1f215b0cd9f4efdc63bb66808f3417331bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be133557f1b0e6672367325b508e65da5513a311", - "reference": "be133557f1b0e6672367325b508e65da5513a311", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc0bd1f215b0cd9f4efdc63bb66808f3417331bc", + "reference": "fc0bd1f215b0cd9f4efdc63bb66808f3417331bc", "shasum": "" }, "require": { @@ -2184,7 +2184,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.20" + "source": "https://github.com/symfony/dom-crawler/tree/v4.4.24" }, "funding": [ { @@ -2200,7 +2200,7 @@ "type": "tidelift" } ], - "time": "2021-02-14T12:29:41+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/event-dispatcher", @@ -2366,16 +2366,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.21", + "version": "v4.4.22", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "940826c465be2690c9fae91b2793481e5cbd6834" + "reference": "f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/940826c465be2690c9fae91b2793481e5cbd6834", - "reference": "940826c465be2690c9fae91b2793481e5cbd6834", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a", + "reference": "f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a", "shasum": "" }, "require": { @@ -2408,7 +2408,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.21" + "source": "https://github.com/symfony/filesystem/tree/v4.4.22" }, "funding": [ { @@ -2424,20 +2424,20 @@ "type": "tidelift" } ], - "time": "2021-03-28T09:59:32+00:00" + "time": "2021-04-01T10:24:12+00:00" }, { "name": "symfony/finder", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" + "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", + "url": "https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983", + "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983", "shasum": "" }, "require": { @@ -2469,7 +2469,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.20" + "source": "https://github.com/symfony/finder/tree/v4.4.24" }, "funding": [ { @@ -2485,7 +2485,7 @@ "type": "tidelift" } ], - "time": "2021-02-12T10:48:09+00:00" + "time": "2021-05-16T12:27:45+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3218,16 +3218,16 @@ }, { "name": "symfony/process", - "version": "v4.4.20", + "version": "v4.4.22", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a" + "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a", - "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a", + "url": "https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b", + "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b", "shasum": "" }, "require": { @@ -3259,7 +3259,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.20" + "source": "https://github.com/symfony/process/tree/v4.4.22" }, "funding": [ { @@ -3275,7 +3275,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-04-07T16:22:29+00:00" }, { "name": "symfony/service-contracts", @@ -3358,16 +3358,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.2.4", + "version": "v5.2.8", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "5aed4875ab514c8cb9b6ff4772baa25fa4c10307" + "reference": "d26db2d2b2d7eb2c1adb8545179f8803998b8237" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5aed4875ab514c8cb9b6ff4772baa25fa4c10307", - "reference": "5aed4875ab514c8cb9b6ff4772baa25fa4c10307", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d26db2d2b2d7eb2c1adb8545179f8803998b8237", + "reference": "d26db2d2b2d7eb2c1adb8545179f8803998b8237", "shasum": "" }, "require": { @@ -3411,7 +3411,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.2.4" + "source": "https://github.com/symfony/var-exporter/tree/v5.3.0-BETA3" }, "funding": [ { @@ -3427,20 +3427,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:01:46+00:00" + "time": "2021-05-07T13:42:21+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.21", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3871c720871029f008928244e56cf43497da7e9d" + "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3871c720871029f008928244e56cf43497da7e9d", - "reference": "3871c720871029f008928244e56cf43497da7e9d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", + "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", "shasum": "" }, "require": { @@ -3482,7 +3482,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.21" + "source": "https://github.com/symfony/yaml/tree/v4.4.24" }, "funding": [ { @@ -3498,7 +3498,7 @@ "type": "tidelift" } ], - "time": "2021-03-05T17:58:50+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "voku/anti-xss", @@ -3841,16 +3841,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.6", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c" + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", "shasum": "" }, "require": { @@ -3885,7 +3885,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.6" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" }, "funding": [ { @@ -3901,32 +3901,34 @@ "type": "tidelift" } ], - "time": "2021-03-25T17:01:18+00:00" + "time": "2021-05-05T19:37:51+00:00" }, { "name": "doctrine/annotations", - "version": "1.12.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", - "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", "autoload": { @@ -3969,9 +3971,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.12.1" + "source": "https://github.com/doctrine/annotations/tree/1.13.1" }, - "time": "2021-02-21T21:00:45+00:00" + "time": "2021-05-16T18:07:53+00:00" }, { "name": "doctrine/instantiator", @@ -4044,16 +4046,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.18.6", + "version": "v2.19.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "5fed214993e7863cef88a08f214344891299b9e4" + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5fed214993e7863cef88a08f214344891299b9e4", - "reference": "5fed214993e7863cef88a08f214344891299b9e4", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5b8a9d852b292c2f8a035200fa6844b1f82300b", + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b", "shasum": "" }, "require": { @@ -4101,6 +4103,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.19-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -4136,7 +4143,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.6" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.0" }, "funding": [ { @@ -4144,7 +4151,7 @@ "type": "github" } ], - "time": "2021-04-19T19:45:11+00:00" + "time": "2021-05-03T21:43:24+00:00" }, { "name": "myclabs/deep-copy", @@ -4206,16 +4213,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.4", + "version": "v4.10.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", "shasum": "" }, "require": { @@ -4256,9 +4263,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" }, - "time": "2020-12-20T10:01:03+00:00" + "time": "2021-05-03T19:11:20+00:00" }, { "name": "pdepend/pdepend", @@ -4825,22 +4832,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.9.1", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "ce10831d4ddc2686c1348a98069771dd314534a8" + "reference": "bd5ef43d1dcaf7272605027c959c1c5ff3761f7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/ce10831d4ddc2686c1348a98069771dd314534a8", - "reference": "ce10831d4ddc2686c1348a98069771dd314534a8", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/bd5ef43d1dcaf7272605027c959c1c5ff3761f7a", + "reference": "bd5ef43d1dcaf7272605027c959c1c5ff3761f7a", "shasum": "" }, "require": { - "composer/xdebug-handler": "^1.0", + "composer/xdebug-handler": "^1.0 || ^2.0", "ext-xml": "*", - "pdepend/pdepend": "^2.7.1", + "pdepend/pdepend": "^2.9.1", "php": ">=5.3.9" }, "require-dev": { @@ -4848,7 +4855,7 @@ "ext-json": "*", "ext-simplexml": "*", "gregwar/rst": "^1.0", - "mikey179/vfsstream": "^1.6.4", + "mikey179/vfsstream": "^1.6.8", "phpunit/phpunit": "^4.8.36 || ^5.7.27", "squizlabs/php_codesniffer": "^2.0" }, @@ -4896,7 +4903,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.9.1" + "source": "https://github.com/phpmd/phpmd/tree/2.10.1" }, "funding": [ { @@ -4904,7 +4911,7 @@ "type": "tidelift" } ], - "time": "2020-09-23T22:06:32+00:00" + "time": "2021-05-11T17:16:16+00:00" }, { "name": "phpspec/prophecy", @@ -6733,16 +6740,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.2.4", + "version": "v5.2.7", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c" + "reference": "d99310c33e833def36419c284f60e8027d359678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c", - "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d99310c33e833def36419c284f60e8027d359678", + "reference": "d99310c33e833def36419c284f60e8027d359678", "shasum": "" }, "require": { @@ -6775,7 +6782,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.2.4" + "source": "https://github.com/symfony/stopwatch/tree/v5.3.0-BETA1" }, "funding": [ { @@ -6791,20 +6798,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-03-29T15:28:41+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.21", + "version": "v4.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806" + "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806", - "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7", + "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7", "shasum": "" }, "require": { @@ -6864,7 +6871,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.21" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.22" }, "funding": [ { @@ -6880,7 +6887,7 @@ "type": "tidelift" } ], - "time": "2021-03-27T19:49:03+00:00" + "time": "2021-04-19T13:36:17+00:00" }, { "name": "theseer/tokenizer", diff --git a/src/Builder.php b/src/Builder.php index a9adfd32b..83db2e48f 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -4,7 +4,7 @@ use DateTime; use Exception; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Helper\MailerFactory; use PHPCensor\Logging\BuildLogger; @@ -206,10 +206,6 @@ public function getSystemConfig($key) return $this->configuration->get($key); } - /** - * @throws Exception\HttpException - * @throws Exception\InvalidArgumentException - */ public function execute() { $this->build->setStatusRunning(); @@ -311,10 +307,6 @@ public function execute() $this->store->save($this->build); } - /** - * @throws Exception\HttpException - * @throws Exception\InvalidArgumentException - */ protected function setErrorTrend() { $this->build->setErrorsTotal($this->store->getErrorsCount($this->build->getId())); diff --git a/src/Command/Action/CreateAdmin.php b/src/Command/Action/CreateAdmin.php index 47fe91e94..3df6dea35 100644 --- a/src/Command/Action/CreateAdmin.php +++ b/src/Command/Action/CreateAdmin.php @@ -4,8 +4,8 @@ namespace PHPCensor\Command\Action; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Service\UserService; use PHPCensor\Store\UserStore; use PHPCensor\StoreRegistry; diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index 36e18dad9..f710baa73 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -6,7 +6,7 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; use PHPCensor\Store; diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index a99e7014b..f27def844 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -10,8 +10,8 @@ use Pheanstalk\Pheanstalk; use PHPCensor\Command\Action\CreateAdmin; use PHPCensor\Configuration; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\ProjectGroup; use PHPCensor\Store\ProjectGroupStore; use PHPCensor\Store\UserStore; diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index de6b5ab45..bce45a960 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -9,14 +9,14 @@ use Pheanstalk\Pheanstalk; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Service\BuildService; use PHPCensor\StoreRegistry; use PHPCensor\Worker\BuildWorker; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; /** * @package PHP Censor diff --git a/src/Console/Application.php b/src/Console/Application.php index e10693a1d..b0ca7a1d8 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -23,7 +23,7 @@ use PHPCensor\Command\WorkerCommand; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Logging\AnsiFormatter; use PHPCensor\Logging\Handler; use PHPCensor\Service\BuildService; diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index e0fd8b604..69402ad49 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -6,7 +6,7 @@ use PHPCensor\BuildFactory; use PHPCensor\Exception\HttpException; use PHPCensor\Exception\HttpException\NotFoundException; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Http\Response; use PHPCensor\Http\Response\RedirectResponse; use PHPCensor\Model\Build; diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 89bb5aeae..e619ef38c 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -20,7 +20,7 @@ use PHPCensor\WebController; use PHPCensor\Helper\Branch; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * Project Controller - Allows users to create, edit and view projects. diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index fcacfcf11..7ee767af7 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -7,8 +7,8 @@ use PHPCensor\Controller; use PHPCensor\Exception\HttpException\ForbiddenException; use PHPCensor\Exception\HttpException\NotFoundException; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Helper\Lang; use PHPCensor\Http\Response; use PHPCensor\Model\Build; diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index 5bbe43d70..a9f4db8d0 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -5,7 +5,7 @@ namespace PHPCensor; use PHPCensor\Common\Exception\Exception; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * @package PHP Censor diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php deleted file mode 100644 index 93b9e5024..000000000 --- a/src/Exception/InvalidArgumentException.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -class InvalidArgumentException extends LogicException -{ -} diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php deleted file mode 100644 index ed631b06d..000000000 --- a/src/Exception/LogicException.php +++ /dev/null @@ -1,17 +0,0 @@ - - */ -class LogicException extends Exception -{ -} diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php deleted file mode 100644 index 724713fd2..000000000 --- a/src/Exception/RuntimeException.php +++ /dev/null @@ -1,17 +0,0 @@ - - */ -class RuntimeException extends Exception -{ -} diff --git a/src/Form/Validator/Yaml.php b/src/Form/Validator/Yaml.php index 5b898fe8b..c43cb8b8b 100644 --- a/src/Form/Validator/Yaml.php +++ b/src/Form/Validator/Yaml.php @@ -2,7 +2,7 @@ namespace PHPCensor\Form\Validator; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Parser; diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index 879cf1fca..048f7f433 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -2,7 +2,7 @@ namespace PHPCensor\Helper; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Logging\BuildLogger; use Symfony\Component\Process\Process; diff --git a/src/Http/Router.php b/src/Http/Router.php index c0a6557c9..07b88cab5 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -3,7 +3,7 @@ namespace PHPCensor\Http; use PHPCensor\Application; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; class Router { diff --git a/src/Migrations/20200505070903_initial_migration_v2.php b/src/Migrations/20200505070903_initial_migration_v2.php index 74a7ef0e9..279130a36 100644 --- a/src/Migrations/20200505070903_initial_migration_v2.php +++ b/src/Migrations/20200505070903_initial_migration_v2.php @@ -3,7 +3,7 @@ use Phinx\Db\Adapter\MysqlAdapter; use Phinx\Migration\AbstractMigration; use PHPCensor\Model\Build; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; class InitialMigrationV2 extends AbstractMigration { diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index c09254d13..102bce146 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -6,7 +6,7 @@ use DateTime; use Exception; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; use PHPCensor\Store\BuildStore; diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 668b22326..1fd70e471 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -6,7 +6,7 @@ use DateTime; use Exception; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; class Project extends Model diff --git a/src/Model/Build.php b/src/Model/Build.php index 688cdb155..ce64340bf 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -7,7 +7,7 @@ use Exception; use PHPCensor\Builder; use PHPCensor\Exception\HttpException; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Helper\Lang; use PHPCensor\Model\Base\Build as BaseBuild; use PHPCensor\Plugin\PhpParallelLint; diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index 65d7022f1..c0cc5021a 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; class BitbucketServerBuild extends GitBuild diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index 21520e657..7c2c9fb1f 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -5,7 +5,7 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Util\BitbucketNotifyPluginResult; diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index fc1c97fcb..6311d457d 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Codeception.php b/src/Plugin/Codeception.php index 90131176d..f03f80c50 100644 --- a/src/Plugin/Codeception.php +++ b/src/Plugin/Codeception.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser; diff --git a/src/Plugin/CopyBuild.php b/src/Plugin/CopyBuild.php index 294542d55..9891dc149 100644 --- a/src/Plugin/CopyBuild.php +++ b/src/Plugin/CopyBuild.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/EmailNotify.php b/src/Plugin/EmailNotify.php index b0ce96268..f0e083b67 100644 --- a/src/Plugin/EmailNotify.php +++ b/src/Plugin/EmailNotify.php @@ -7,7 +7,7 @@ use PHPCensor\Plugin; use PHPCensor\View; use Psr\Log\LogLevel; -use RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * Email Plugin - Provides simple email capability. diff --git a/src/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php index c690a1da0..9012a7ed4 100644 --- a/src/Plugin/FlowdockNotify.php +++ b/src/Plugin/FlowdockNotify.php @@ -6,8 +6,8 @@ use FlowdockClient\Api\Push\Push; use FlowdockClient\Api\Push\TeamInboxMessage; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index e1f322f00..c9ee6a52f 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -4,7 +4,7 @@ use HipChat\HipChat; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 619982c7d..8d599bc44 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -7,7 +7,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index c43b3aa89..f18101b8c 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -7,7 +7,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index cd8b9c747..25c30b09f 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -5,8 +5,8 @@ use Exception; use PDO; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index 72469839f..116fcf191 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; use Symfony\Component\Filesystem\Filesystem; diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index 02af51c33..14a95bb6c 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; diff --git a/src/Plugin/Phing.php b/src/Plugin/Phing.php index 67eb2e4a0..f51c2deb4 100644 --- a/src/Plugin/Phing.php +++ b/src/Plugin/Phing.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index 4a75de2c8..8cf783200 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -9,7 +9,7 @@ use PHPCensor\Model\BuildError; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing. diff --git a/src/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php index 875829cd2..9c0e7a118 100644 --- a/src/Plugin/PhpCpd.php +++ b/src/Plugin/PhpCpd.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index 040912922..35168b268 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -4,7 +4,7 @@ use Exception; use PHPCensor\Builder; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; use PHPCensor\Plugin; diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index e0a155cb8..6ba258a78 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -8,7 +8,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * PHP Mess Detector Plugin - Allows PHP Mess Detector testing. diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index 816c7ba2c..bb6618997 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -13,7 +13,7 @@ use PHPCensor\Plugin\Util\PhpUnitResultJunit; use PHPCensor\ZeroConfigPluginInterface; use Symfony\Component\Filesystem\Filesystem; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * PHP Unit Plugin - A rewrite of the original PHP Unit plugin diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index d78cb0001..dddd950b0 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -8,7 +8,7 @@ use PHPCensor\Model\BuildError; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * SensioLabs Security Checker Plugin diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index 4b593d101..e27fce86a 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -7,7 +7,7 @@ use PHPCensor\Builder; use PHPCensor\Model\Build; use PHPCensor\Plugin; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * Sensiolabs Insight Plugin - Allows Sensiolabs Insight testing. diff --git a/src/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php index 86554b195..f18802151 100644 --- a/src/Plugin/SlackNotify.php +++ b/src/Plugin/SlackNotify.php @@ -6,7 +6,7 @@ use Maknz\Slack\AttachmentField; use Maknz\Slack\Client; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index 8541fc4a7..5114ff873 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -5,7 +5,7 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 3816c4484..907188168 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin\Util; use Exception; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Helper\Lang; use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; diff --git a/src/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php index c73687d0e..cf8f6fb14 100644 --- a/src/Plugin/Util/Factory.php +++ b/src/Plugin/Util/Factory.php @@ -4,8 +4,8 @@ use Closure; use DomainException; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Plugin; use Pimple\Container; use ReflectionClass; diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index 3c56b44c5..b28c8ed00 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin\Util; use Exception; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; /** * Class PhpUnitResult parses the results for the PhpUnitV2 plugin diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index 21916736b..d633009c6 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -3,7 +3,7 @@ namespace PHPCensor\Plugin\Util; use Exception; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Helper\Xml; use SimpleXMLElement; diff --git a/src/Plugin/WebhookNotify.php b/src/Plugin/WebhookNotify.php index 6c7b41df7..560eba466 100644 --- a/src/Plugin/WebhookNotify.php +++ b/src/Plugin/WebhookNotify.php @@ -7,7 +7,7 @@ use GuzzleHttp\Exception\GuzzleException; use PHPCensor\Builder; use PHPCensor\Exception\HttpException; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Plugin; diff --git a/src/Store.php b/src/Store.php index 80d96e987..1a02fb34d 100644 --- a/src/Store.php +++ b/src/Store.php @@ -4,8 +4,8 @@ use Exception; use PDO; -use PHPCensor\Exception\InvalidArgumentException; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; abstract class Store { diff --git a/src/View.php b/src/View.php index 986659825..f5740fa24 100644 --- a/src/View.php +++ b/src/View.php @@ -2,7 +2,7 @@ namespace PHPCensor; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; class View { diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 81b365e02..4d822bdf2 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -97,7 +97,7 @@ public function testExecute() public function testExecuteWithUnknownProjectId() { - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); $commandTester = $this->getCommandTester(); $commandTester->execute(['projectId' => 2]); diff --git a/tests/src/FormTest.php b/tests/src/FormTest.php index f919fc692..a72d64d94 100644 --- a/tests/src/FormTest.php +++ b/tests/src/FormTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Form; use PHPUnit\Framework\TestCase; diff --git a/tests/src/Model/Base/BuildTest.php b/tests/src/Model/Base/BuildTest.php index 35cf3a0f0..cc2931c72 100644 --- a/tests/src/Model/Base/BuildTest.php +++ b/tests/src/Model/Base/BuildTest.php @@ -3,7 +3,7 @@ namespace Tests\PHPCensor\Model\Base; use DateTime; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Base\Build; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -118,7 +118,7 @@ public function testStatus() $build->setStatusFailed(); self::assertEquals(Build::STATUS_FAILED, $build->getStatus()); - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); $build->setStatus(10); } @@ -267,7 +267,7 @@ public function testSource() $result = $build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED); self::assertEquals(false, $result); - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); $build->setSource(20); } diff --git a/tests/src/Model/Base/ProjectTest.php b/tests/src/Model/Base/ProjectTest.php index 879633f53..a2c1eb517 100644 --- a/tests/src/Model/Base/ProjectTest.php +++ b/tests/src/Model/Base/ProjectTest.php @@ -148,7 +148,7 @@ public function testType() $result = $project->setType('git'); self::assertEquals(false, $result); - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); $project->setType('invalid-type'); } diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index dbc7615bc..b846a249c 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Model; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model\Build; use PHPCensor\Model\Build\GogsBuild; use PHPCensor\Model\Project; diff --git a/tests/src/Model/ProjectTest.php b/tests/src/Model/ProjectTest.php index b84f457ca..e00e71443 100644 --- a/tests/src/Model/ProjectTest.php +++ b/tests/src/Model/ProjectTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Model; -use PHPCensor\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; use PHPCensor\Model\Project; use PHPCensor\StoreRegistry; diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index 50de183f6..79904a279 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Plugin\Util; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; use PHPCensor\Plugin\Util\Executor; use PHPCensor\StoreRegistry; diff --git a/tests/src/Plugin/Util/FactoryTest.php b/tests/src/Plugin/Util/FactoryTest.php index 9c7d4c4d2..1b3858a02 100644 --- a/tests/src/Plugin/Util/FactoryTest.php +++ b/tests/src/Plugin/Util/FactoryTest.php @@ -2,7 +2,7 @@ namespace Tests\PHPCensor\Plugin\Util; -use PHPCensor\Exception\RuntimeException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Plugin\Util\Factory; use PHPUnit\Framework\TestCase; use stdClass; @@ -41,14 +41,14 @@ protected function tearDown() : void public function testRegisterResourceThrowsExceptionWithoutTypeAndName() { - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); self::expectExceptionMessage('Type or Name must be specified'); $this->testedFactory->registerResource($this->resourceLoader, null, null); } public function testRegisterResourceThrowsExceptionIfLoaderIsntFunction() { - self::expectException('\PHPCensor\Exception\InvalidArgumentException'); + self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); self::expectExceptionMessage('$loader is expected to be a function'); $this->testedFactory->registerResource(["dummy"], "TestName", "TestClass"); } From a3236720ca0859f8d3c9dfd3f3ab113809dd44dd Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 24 May 2021 22:41:03 +0700 Subject: [PATCH 012/212] Refactoring: More tests. --- src/DatabaseConnection.php | 57 +++-- src/StoreRegistry.php | 20 +- tests/src/DatabaseConnectionTest.php | 369 +++++++++++++++++++++++++++ tests/src/StoreRegistryTest.php | 71 ++++++ tests/src/ViewTest.php | 6 +- 5 files changed, 497 insertions(+), 26 deletions(-) create mode 100644 tests/src/DatabaseConnectionTest.php create mode 100644 tests/src/StoreRegistryTest.php diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php index c014f78ce..5cab37df9 100644 --- a/src/DatabaseConnection.php +++ b/src/DatabaseConnection.php @@ -12,16 +12,18 @@ */ class DatabaseConnection { - private \PDO $pdoConnection; + private ?\PDO $pdoConnection = null; + + private string $dsn; + + private ?string $username; + + private ?string $password; + + private ?array $options; private string $sequencePattern; - /** - * @param string $dsn - * @param string|null $username - * @param string|null $password - * @param array|null $options - */ public function __construct( string $dsn, ?string $username = null, @@ -30,21 +32,36 @@ public function __construct( string $sequencePattern = '%s_id_seq' ) { $this->sequencePattern = $sequencePattern; - $this->pdoConnection = new \PDO($dsn, $username, $password, $options); + + $this->dsn = $dsn; + $this->username = $username; + $this->password = $password; + $this->options = $options; } public function getPdo(): \PDO { + if (null === $this->pdoConnection) { + $this->pdoConnection = new \PDO($this->dsn, $this->username, $this->password, $this->options); + } + return $this->pdoConnection; } + public function setPdo(\PDO $pdoConnection): self + { + $this->pdoConnection = $pdoConnection; + + return $this; + } + public function quoteNames(string $query): string { - $driver = $this->pdoConnection->getAttribute(\PDO::ATTR_DRIVER_NAME); + $driver = $this->getPdo()->getAttribute(\PDO::ATTR_DRIVER_NAME); $pattern = '\1'; if (DatabaseManager::MYSQL_TYPE === $driver) { $pattern = '`\1`'; - } elseif (DatabaseManager::MYSQL_TYPE === $driver) { + } elseif (DatabaseManager::POSTGRESQL_TYPE === $driver) { $pattern = '"\1"'; } @@ -53,11 +70,11 @@ public function quoteNames(string $query): string public function lastInsertId(string $tableName): int { - if (DatabaseManager::POSTGRESQL_TYPE === $this->pdoConnection->getAttribute(\PDO::ATTR_DRIVER_NAME)) { - return (int)$this->pdoConnection->lastInsertId(\sprintf("\"{$this->sequencePattern}\"", $tableName)); + if (DatabaseManager::POSTGRESQL_TYPE === $this->getPdo()->getAttribute(\PDO::ATTR_DRIVER_NAME)) { + return (int)$this->getPdo()->lastInsertId(\sprintf("\"{$this->sequencePattern}\"", $tableName)); } - return (int)$this->pdoConnection->lastInsertId(); + return (int)$this->getPdo()->lastInsertId(); } /** @@ -68,7 +85,7 @@ public function lastInsertId(string $tableName): int */ public function prepare(string $query, array $options = []) { - return $this->pdoConnection->prepare($this->quoteNames($query), $options); + return $this->getPdo()->prepare($this->quoteNames($query), $options); } /** @@ -78,7 +95,7 @@ public function prepare(string $query, array $options = []) */ public function exec(string $statement) { - return $this->pdoConnection->exec($statement); + return $this->getPdo()->exec($this->quoteNames($statement)); } /** @@ -88,26 +105,26 @@ public function exec(string $statement) */ public function query(string $statement) { - return $this->pdoConnection->query($statement); + return $this->getPdo()->query($this->quoteNames($statement)); } public function beginTransaction(): bool { - return $this->pdoConnection->beginTransaction(); + return $this->getPdo()->beginTransaction(); } public function commit(): bool { - return $this->pdoConnection->commit(); + return $this->getPdo()->commit(); } public function rollBack(): bool { - return $this->pdoConnection->rollBack(); + return $this->getPdo()->rollBack(); } public function inTransaction(): bool { - return $this->pdoConnection->inTransaction(); + return $this->getPdo()->inTransaction(); } } diff --git a/src/StoreRegistry.php b/src/StoreRegistry.php index 86b146b1f..7f13363af 100644 --- a/src/StoreRegistry.php +++ b/src/StoreRegistry.php @@ -4,6 +4,14 @@ namespace PHPCensor; +use PHPCensor\Common\Exception\RuntimeException; + +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class StoreRegistry { private DatabaseManager $databaseManager; @@ -23,10 +31,14 @@ public function __construct(DatabaseManager $databaseManager) public function get(string $storeName): ?Store { if (!isset($this->loadedStores[$storeName])) { - $class = 'PHPCensor\\Store\\' . $storeName . 'Store'; - $store = new $class($this->databaseManager, $this); - - $this->loadedStores[$storeName] = $store; + try { + $class = 'PHPCensor\\Store\\' . $storeName . 'Store'; + $store = new $class($this->databaseManager, $this); + + $this->loadedStores[$storeName] = $store; + } catch (\Throwable $exception) { + throw new RuntimeException($exception->getMessage()); + } } return $this->loadedStores[$storeName]; diff --git a/tests/src/DatabaseConnectionTest.php b/tests/src/DatabaseConnectionTest.php new file mode 100644 index 000000000..6523fa9f8 --- /dev/null +++ b/tests/src/DatabaseConnectionTest.php @@ -0,0 +1,369 @@ +getPdo()); + } + + public function testConstructorWithExternalPDO() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $databaseConnection = new DatabaseConnection('any'); + $databaseConnection->setPdo($pdoConnection); + + self::assertInstanceOf(DatabaseConnection::class, $databaseConnection); + self::assertInstanceOf(\PDO::class, $databaseConnection->getPdo()); + } + + public function testQuoteNamesForMySQL() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::MYSQL_TYPE); + + $databaseConnection = new DatabaseConnection('mysql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + 'SELECT `test_table`.`id`,`test`, `date` FROM `test_table` WHERE `condition` > 2', + $databaseConnection->quoteNames( + 'SELECT {{test_table}}.{{id}},{{test}}, {{date}} FROM {{test_table}} WHERE {{condition}} > 2' + ) + ); + } + + public function testQuoteNamesForPostgreSQL() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $databaseConnection = new DatabaseConnection('pgsql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + 'SELECT "test_table"."id","test", "date" FROM "test_table" WHERE "condition" > 2', + $databaseConnection->quoteNames( + 'SELECT {{test_table}}.{{id}},{{test}}, {{date}} FROM {{test_table}} WHERE {{condition}} > 2' + ) + ); + } + + /** + * @dataProvider prepareDataProvider + */ + public function testPrepare($result, array $option) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $pdoConnection + ->method('prepare') + ->with( + 'SELECT "test_table"."id","test", "date" FROM "test_table" WHERE "condition" > 2', + $option + ) + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('pgsql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + $result, + $databaseConnection->prepare( + 'SELECT {{test_table}}.{{id}},{{test}}, {{date}} FROM {{test_table}} WHERE {{condition}} > 2', + $option + ) + ); + } + + public function testLastInsertIdForPostgreSQL() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $pdoConnection + ->method('lastInsertId') + ->with('"test_table_id_seq"') + ->willReturn(10); + + $databaseConnection = new DatabaseConnection('pgsql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + 10, + $databaseConnection->lastInsertId('test_table') + ); + } + + public function testLastInsertIdForPostgreSQLWithNonDefaultSequenceName() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $pdoConnection + ->method('lastInsertId') + ->with('"sequence_test_table"') + ->willReturn(10); + + $databaseConnection = new DatabaseConnection('pgsql', null, null, null, 'sequence_%s'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + 10, + $databaseConnection->lastInsertId('test_table') + ); + } + + public function testLastInsertIdForMySQL() + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::MYSQL_TYPE); + + $pdoConnection + ->method('lastInsertId') + ->willReturn(11); + + $databaseConnection = new DatabaseConnection('mysql', null, null, null, 'sequence_%s'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + 11, + $databaseConnection->lastInsertId('test_table') + ); + } + + /** + * @dataProvider execDataProvider + */ + public function testExec($result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $pdoConnection + ->method('exec') + ->with('SELECT "test_table"."id","test", "date" FROM "test_table" WHERE "condition" > 2') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('pgsql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + $result, + $databaseConnection->exec( + 'SELECT {{test_table}}.{{id}},{{test}}, {{date}} FROM {{test_table}} WHERE {{condition}} > 2' + ) + ); + } + + /** + * @dataProvider queryDataProvider + */ + public function testQuery($result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('getAttribute') + ->with(\PDO::ATTR_DRIVER_NAME) + ->willReturn(DatabaseManager::POSTGRESQL_TYPE); + + $pdoConnection + ->method('query') + ->with('SELECT "test_table"."id","test", "date" FROM "test_table" WHERE "condition" > 2') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('pgsql'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals( + $result, + $databaseConnection->query( + 'SELECT {{test_table}}.{{id}},{{test}}, {{date}} FROM {{test_table}} WHERE {{condition}} > 2' + ) + ); + } + + /** + * @dataProvider booleanResultDataProvider + */ + public function testBeginTransaction(bool $result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('beginTransaction') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('any'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals($result, $databaseConnection->beginTransaction()); + } + + /** + * @dataProvider booleanResultDataProvider + */ + public function testCommit(bool $result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('commit') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('any'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals($result, $databaseConnection->commit()); + } + + /** + * @dataProvider booleanResultDataProvider + */ + public function testRollback(bool $result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('rollback') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('any'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals($result, $databaseConnection->rollBack()); + } + + /** + * @dataProvider booleanResultDataProvider + */ + public function testInTransaction(bool $result) + { + $pdoConnection = $this + ->getMockBuilder(\PDO::class) + ->disableOriginalConstructor() + ->getMock(); + + $pdoConnection + ->method('inTransaction') + ->willReturn($result); + + $databaseConnection = new DatabaseConnection('any'); + $databaseConnection->setPdo($pdoConnection); + + self::assertEquals($result, $databaseConnection->inTransaction()); + } + + public function prepareDataProvider(): array + { + return [ + [false, [\PDO::ATTR_CURSOR]], + [false, []], + [new \PDOStatement(), [\PDO::ATTR_CURSOR]], + [new \PDOStatement(), []], + ]; + } + + public function execDataProvider(): array + { + return [ + [false], + [0], + [2], + ]; + } + + public function queryDataProvider(): array + { + return [ + [false], + [new \PDOStatement()], + ]; + } + + public function booleanResultDataProvider(): array + { + return [ + [true], + [false], + ]; + } +} diff --git a/tests/src/StoreRegistryTest.php b/tests/src/StoreRegistryTest.php new file mode 100644 index 000000000..8daa63451 --- /dev/null +++ b/tests/src/StoreRegistryTest.php @@ -0,0 +1,71 @@ +getMockBuilder(DatabaseManager::class) + ->disableOriginalConstructor() + ->getMock(); + + $storeRegistry = new StoreRegistry($databaseManager); + + self::assertInstanceOf(StoreRegistry::class, $storeRegistry); + } + + public function testGetSuccess() + { + /** @var DatabaseManager $databaseManager */ + $databaseManager = $this + ->getMockBuilder(DatabaseManager::class) + ->disableOriginalConstructor() + ->getMock(); + + $storeRegistry = new StoreRegistry($databaseManager); + $buildStore = $storeRegistry->get('Build'); + + self::assertInstanceOf(BuildStore::class, $buildStore); + } + + public function testGetSuccessFromCache() + { + /** @var DatabaseManager $databaseManager */ + $databaseManager = $this + ->getMockBuilder(DatabaseManager::class) + ->disableOriginalConstructor() + ->getMock(); + + $storeRegistry = new StoreRegistry($databaseManager); + $buildStore = $storeRegistry->get('Build'); + $buildStore2 = $storeRegistry->get('Build'); + + self::assertInstanceOf(BuildStore::class, $buildStore2); + self::assertSame($buildStore, $buildStore2); + } + + public function testGetNotFound() + { + self::expectException(RuntimeException::class); + + /** @var DatabaseManager $databaseManager */ + $databaseManager = $this + ->getMockBuilder(DatabaseManager::class) + ->disableOriginalConstructor() + ->getMock(); + + $storeRegistry = new StoreRegistry($databaseManager); + $buildStore = $storeRegistry->get('NotExists'); + } +} diff --git a/tests/src/ViewTest.php b/tests/src/ViewTest.php index 0c29c6a5c..b2c468923 100644 --- a/tests/src/ViewTest.php +++ b/tests/src/ViewTest.php @@ -1,8 +1,10 @@ Date: Sat, 29 May 2021 14:52:14 +0700 Subject: [PATCH 013/212] Refactoring: Simplifing plugin factory. --- src/Builder.php | 37 +--- src/Plugin/Util/Executor.php | 10 +- src/Plugin/Util/Factory.php | 185 ++----------------- tests/src/Plugin/Util/ExecutorTest.php | 4 +- tests/src/Plugin/Util/FactoryTest.php | 183 ++++-------------- tests/src/Service/BuildStatusServiceTest.php | 2 + tests/src/ViewTest.php | 1 + 7 files changed, 67 insertions(+), 355 deletions(-) diff --git a/src/Builder.php b/src/Builder.php index 83db2e48f..92b7c6e78 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -504,42 +504,7 @@ public function logDebug(string $message): void */ private function buildPluginFactory(Build $build) { - $pluginFactory = new PluginFactory(); - - $self = $this; - $pluginFactory->registerResource( - function () use ($self) { - return $self; - }, - null, - 'PHPCensor\Builder' - ); - - $pluginFactory->registerResource( - function () use ($build) { - return $build; - }, - null, - 'PHPCensor\Model\Build' - ); - - $logger = $this->logger; - $pluginFactory->registerResource( - function () use ($logger) { - return $logger; - }, - null, - 'Psr\Log\LoggerInterface' - ); - - $pluginFactory->registerResource( - function () use ($self) { - $factory = new MailerFactory($self->getSystemConfig('php-censor')); - return $factory->getSwiftMailerFromConfig(); - }, - null, - 'Swift_Mailer' - ); + $pluginFactory = new PluginFactory($this, $build); return $pluginFactory; } diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 907188168..e457b7268 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -114,8 +114,7 @@ public function getBranchSpecificConfig($config, $branch) */ protected function getBranchSpecificPlugins($config, $stage, $pluginsToExecute) { - /** @var Build $build */ - $build = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build'); + $build = $this->pluginFactory->getBuild(); $branch = $build->getBranch(); $branchConfig = $this->getBranchSpecificConfig($config, $branch); if (!$branchConfig) { @@ -271,9 +270,9 @@ protected function setPluginStatus($stage, $plugin, $status) */ private function getBuildSummary() { - /** @var Build $build */ - $build = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build'); + $build = $this->pluginFactory->getBuild(); $metas = $this->store->getMeta('plugin-summary', $build->getProjectId(), $build->getId()); + return isset($metas[0]['meta_value']) ? $metas[0]['meta_value'] : []; } @@ -284,8 +283,7 @@ private function getBuildSummary() */ private function setBuildSummary($summary) { - /** @var Build $build */ - $build = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build'); + $build = $this->pluginFactory->getBuild(); $this->store->setMeta($build->getId(), 'plugin-summary', json_encode($summary)); } } diff --git a/src/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php index cf8f6fb14..28480b84c 100644 --- a/src/Plugin/Util/Factory.php +++ b/src/Plugin/Util/Factory.php @@ -1,187 +1,40 @@ */ class Factory { - const TYPE_ARRAY = "array"; - const TYPE_CALLABLE = "callable"; - - /** - * @var Container - */ - private $container; - - /** - * @param Container $container - */ - public function __construct(Container $container = null) - { - if ($container) { - $this->container = $container; - } else { - $this->container = new Container(); - } - } - - /** - * Builds an instance of plugin of class $className. $options will - * be passed along with any resources registered with the factory. - * - * @param string $className - * @param array|null $options - * - * @return Plugin - */ - public function buildPlugin($className, $options = []) - { - $reflectedPlugin = new ReflectionClass($className); + private Builder $builder; - $constructor = $reflectedPlugin->getConstructor(); + private Build $build; - if ($constructor) { - $argsToUse = []; - foreach ($constructor->getParameters() as $param) { - if ('options' === $param->getName()) { - $argsToUse[] = $options; - } else { - $argsToUse = $this->addArgFromParam($argsToUse, $param); - } - } - /** @var Plugin $plugin */ - $plugin = $reflectedPlugin->newInstanceArgs($argsToUse); - } else { - /** @var Plugin $plugin */ - $plugin = $reflectedPlugin->newInstance(); - } - - return $plugin; - } - - /** - * @param callable $loader - * @param string|null $name - * @param string|null $type - * - * @throws InvalidArgumentException - * - * @internal param mixed $resource - */ - public function registerResource( - $loader, - $name = null, - $type = null + public function __construct( + Builder $builder, + Build $build ) { - if ($name === null && $type === null) { - throw new InvalidArgumentException( - "Type or Name must be specified" - ); - } - - if (!($loader instanceof Closure)) { - throw new InvalidArgumentException( - '$loader is expected to be a function' - ); - } - - $resourceID = $this->getInternalID($type, $name); - - $this->container[$resourceID] = $loader; + $this->builder = $builder; + $this->build = $build; } - /** - * Get an internal resource ID. - * @param null $type - * @param null $name - * @return string - */ - private function getInternalID($type = null, $name = null) + public function buildPlugin(string $className, array $options = []): Plugin { - $type = $type ? : ""; - $name = $name ? : ""; - return $type . "-" . $name; + return new $className($this->builder, $this->build, $options); } - /** - * @param string $type - * @param string $name - * @return mixed - */ - public function getResourceFor($type = null, $name = null) + public function getBuild(): Build { - $fullId = $this->getInternalID($type, $name); - if (isset($this->container[$fullId])) { - return $this->container[$fullId]; - } - - $typeOnlyID = $this->getInternalID($type, null); - if (isset($this->container[$typeOnlyID])) { - return $this->container[$typeOnlyID]; - } - - $nameOnlyID = $this->getInternalID(null, $name); - if (isset($this->container[$nameOnlyID])) { - return $this->container[$nameOnlyID]; - } - - return null; - } - - /** - * @param ReflectionParameter $param - * @return null|string - */ - private function getParamType(ReflectionParameter $param) - { - $class = $param->getType() && !$param->getType()->isBuiltin() - ? new ReflectionClass($param->getType()->getName()) - : null; - - if ($class) { - return $class->getName(); - } elseif ($param->getType() && $param->getType()->getName() === 'array') { - return self::TYPE_ARRAY; - } elseif (is_callable($param)) { - return self::TYPE_CALLABLE; - } else { - return null; - } - } - - /** - * @param $existingArgs - * @param ReflectionParameter $param - * @return array - * @throws DomainException - */ - private function addArgFromParam($existingArgs, ReflectionParameter $param) - { - $name = $param->getName(); - $type = $this->getParamType($param); - $arg = $this->getResourceFor($type, $name); - - if ($arg !== null) { - $existingArgs[] = $arg; - } elseif ($arg === null && $param->isOptional()) { - $existingArgs[] = $param->getDefaultValue(); - } else { - throw new RuntimeException( - "Unsatisfied dependency: " . $param->getName() - ); - } - - return $existingArgs; + return $this->build; } } diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index 79904a279..3bed2ad0f 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -97,7 +97,7 @@ public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin() $mockPlugin->execute()->shouldBeCalledTimes(1); $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal()); - $this->mockFactory->getResourceFor('PHPCensor\Model\Build')->willReturn($build); + $this->mockFactory->getBuild()->willReturn($build); $this->testedExecutor->executePlugin($pluginName, $options); } @@ -172,7 +172,7 @@ public function testExecutePlugins_CallsEachPluginForStage() $this->mockFactory ->buildPlugin($pluginNamespace . 'PhpUnit', $phpUnitPluginOptions) ->willReturn($mockPhpUnitPlugin->reveal()); - $this->mockFactory->getResourceFor('PHPCensor\Model\Build')->willReturn($build); + $this->mockFactory->getBuild()->willReturn($build); $mockBehatPlugin = $this->prophesize('PHPCensor\Plugin'); $mockBehatPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); diff --git a/tests/src/Plugin/Util/FactoryTest.php b/tests/src/Plugin/Util/FactoryTest.php index 1b3858a02..a30e84a6a 100644 --- a/tests/src/Plugin/Util/FactoryTest.php +++ b/tests/src/Plugin/Util/FactoryTest.php @@ -1,172 +1,65 @@ testedFactory = new Factory(); + $builder = $this + ->getMockBuilder(Builder::class) + ->disableOriginalConstructor() + ->getMock(); - // Setup a resource that can be returned and asserted against - $this->expectedResource = new stdClass(); - $resourceLink = $this->expectedResource; - $this->resourceLoader = function () use (&$resourceLink) { - return $resourceLink; - }; - } + $build = $this + ->getMockBuilder(Build::class) + ->disableOriginalConstructor() + ->getMock(); - protected function tearDown() : void - { - // Nothing to do. - } + $factory = new Factory($builder, $build); - public function testRegisterResourceThrowsExceptionWithoutTypeAndName() - { - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); - self::expectExceptionMessage('Type or Name must be specified'); - $this->testedFactory->registerResource($this->resourceLoader, null, null); + self::assertInstanceOf(Factory::class, $factory); } - public function testRegisterResourceThrowsExceptionIfLoaderIsntFunction() + public function testGetBuild() { - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); - self::expectExceptionMessage('$loader is expected to be a function'); - $this->testedFactory->registerResource(["dummy"], "TestName", "TestClass"); - } + $builder = $this + ->getMockBuilder(Builder::class) + ->disableOriginalConstructor() + ->getMock(); - public function testBuildPluginWorksWithSingleOptionalArgConstructor() - { - $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleOptionalArg'); - $plugin = $this->testedFactory->buildPlugin($pluginClass); - self::assertInstanceOf($pluginClass, $plugin); - } - - public function testBuildPluginThrowsExceptionIfMissingResourcesForRequiredArg() - { - self::expectException(RuntimeException::class); - self::expectExceptionMessage('Unsatisfied dependency: requiredArgument'); - - $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg'); - $this->testedFactory->buildPlugin($pluginClass); - } + $build = $this + ->getMockBuilder(Build::class) + ->disableOriginalConstructor() + ->getMock(); - public function testBuildPluginLoadsArgumentsBasedOnName() - { - $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg'); - - $this->testedFactory->registerResource( - $this->resourceLoader, - "requiredArgument" - ); - - /** @var ExamplePluginWithSingleRequiredArg $plugin */ - $plugin = $this->testedFactory->buildPlugin($pluginClass); + $factory = new Factory($builder, $build); - self::assertEquals($this->expectedResource, $plugin->RequiredArgument); + self::assertInstanceOf(Build::class, $factory->getBuild()); } - public function testBuildPluginLoadsArgumentsBasedOnType() + public function testBuildPlugin() { - $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleTypedRequiredArg'); + $builder = $this + ->getMockBuilder(Builder::class) + ->disableOriginalConstructor() + ->getMock(); - $this->testedFactory->registerResource( - $this->resourceLoader, - null, - "stdClass" - ); + $build = $this + ->getMockBuilder(Build::class) + ->disableOriginalConstructor() + ->getMock(); - /** @var ExamplePluginWithSingleTypedRequiredArg $plugin */ - $plugin = $this->testedFactory->buildPlugin($pluginClass); - - self::assertEquals($this->expectedResource, $plugin->RequiredArgument); - } - - public function testBuildPluginLoadsFullExample() - { - $pluginClass = $this->getFakePluginClassName('ExamplePluginFull'); - - $this->registerBuildAndBuilder(); - - /** @var ExamplePluginFull $plugin */ - $plugin = $this->testedFactory->buildPlugin($pluginClass); - - self::assertInstanceOf($pluginClass, $plugin); - } - - public function testBuildPluginLoadsFullExampleWithOptions() - { - $pluginClass = $this->getFakePluginClassName('ExamplePluginFull'); - - $expectedArgs = [ - 'thing' => "stuff" - ]; - - $this->registerBuildAndBuilder(); - - /** @var ExamplePluginFull $plugin */ - $plugin = $this->testedFactory->buildPlugin( - $pluginClass, - $expectedArgs - ); - - self::assertIsArray($plugin->options); - self::assertArrayHasKey('thing', $plugin->options); - } - - /** - * Registers mocked Builder and Build classes so that realistic plugins - * can be tested. - */ - private function registerBuildAndBuilder() - { - $self = $this; - - $this->testedFactory->registerResource( - function () use ($self) { - return $self - ->getMockBuilder('PHPCensor\Builder') - ->disableOriginalConstructor() - ->getMock(); - }, - null, - 'PHPCensor\\Builder' - ); - - $this->testedFactory->registerResource( - function () use ($self) { - return $self - ->getMockBuilder('PHPCensor\Model\Build') - ->disableOriginalConstructor() - ->getMock(); - }, - null, - 'PHPCensor\\Model\\Build' - ); - } - - protected function getFakePluginClassName($pluginName) - { - $pluginNamespace = '\\Tests\\PHPCensor\\Plugin\\Util\\Fake\\'; + $factory = new Factory($builder, $build); - return $pluginNamespace . $pluginName; + self::assertInstanceOf(PhpUnit::class, $factory->buildPlugin(PhpUnit::class, [])); } } diff --git a/tests/src/Service/BuildStatusServiceTest.php b/tests/src/Service/BuildStatusServiceTest.php index 0252d5563..543c68a60 100644 --- a/tests/src/Service/BuildStatusServiceTest.php +++ b/tests/src/Service/BuildStatusServiceTest.php @@ -98,7 +98,9 @@ protected function getBuild($configId, $setProject = true) $build = new Build($this->storeRegistry); $build->setId($config[$configId]['id']); $build->setBranch(self::BRANCH); + $build->setStatus($config[$configId]['status']); + if ($config[$configId]['finishDateTime']) { $build->setFinishDate(new DateTime($config[$configId]['finishDateTime'])); } diff --git a/tests/src/ViewTest.php b/tests/src/ViewTest.php index b2c468923..eb1c41359 100644 --- a/tests/src/ViewTest.php +++ b/tests/src/ViewTest.php @@ -29,6 +29,7 @@ public function testViewVars() $view->who = 'World'; self::assertTrue(isset($view->who)); + self::assertEquals('World', $view->who); self::assertFalse(isset($view->what)); self::assertTrue($view->render() == 'Hello World'); } From e1270891847484cb955c6688fae85237bdb2c000 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 29 May 2021 16:14:53 +0700 Subject: [PATCH 014/212] Refactoring: Fixes. --- src/Application.php | 2 +- src/BuildFactory.php | 7 +------ src/Command/RebuildQueueCommand.php | 2 +- src/Command/WorkerCommand.php | 2 +- src/Controller/BuildController.php | 2 +- src/Controller/BuildStatusController.php | 2 +- src/Controller/ProjectController.php | 2 +- src/Controller/WidgetLastBuildsController.php | 4 ++-- src/Service/BuildService.php | 4 ++-- src/Store.php | 2 +- 10 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/Application.php b/src/Application.php index 841807fce..5793b600a 100644 --- a/src/Application.php +++ b/src/Application.php @@ -187,7 +187,7 @@ public function handleRequest() protected function loadController($class) { /** @var Controller $controller */ - $controller = new $class($this->configuration, $this->request); + $controller = new $class($this->configuration, $this->storeRegistry, $this->request); $controller->init(); diff --git a/src/BuildFactory.php b/src/BuildFactory.php index 7a508a5ab..3b4158176 100644 --- a/src/BuildFactory.php +++ b/src/BuildFactory.php @@ -90,12 +90,7 @@ public static function getBuild( } $class = '\\PHPCensor\\Model\\Build\\' . $type; - - if ($class instanceof Build\GitBuild || $class instanceof Build\HgBuild) { - $build = new $class($configuration, $storeRegistry, $build->getDataArray()); - } else { - $build = new $class($configuration, $build->getDataArray()); - } + $build = new $class($configuration, $storeRegistry, $build->getDataArray()); } return $build; diff --git a/src/Command/RebuildQueueCommand.php b/src/Command/RebuildQueueCommand.php index a1dd63a32..464026a3a 100644 --- a/src/Command/RebuildQueueCommand.php +++ b/src/Command/RebuildQueueCommand.php @@ -49,7 +49,7 @@ protected function execute(InputInterface $input, OutputInterface $output) while (\count($result['items'])) { $build = \array_shift($result['items']); - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); $project = $build->getProject(); $this->logger->info('Added build #' . $build->getId() . ' to queue.'); diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index bce45a960..028e09503 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->logger, $this->buildService, $config['host'], - $this->configuration->get('php-censor.queue.port', Pheanstalk::DEFAULT_PORT), + (int)$this->configuration->get('php-censor.queue.port', Pheanstalk::DEFAULT_PORT), $config['name'], ($input->hasOption('periodical-work') && $input->getOption('periodical-work')) )) diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 7cd057309..c61095a52 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -108,7 +108,7 @@ public function view($buildId) $this->view->uiPlugins = $this->getUiPlugins(); $this->view->build = $build; $this->view->data = $data; - $this->view->environment = $this->storeRegistry->get('Environment')->getById($build->getEnvironmentId()); + $this->view->environment = $this->storeRegistry->get('Environment')->getById((int)$build->getEnvironmentId()); $this->view->plugin = urldecode($plugin); $this->view->plugins = $errorStore->getKnownPlugins($buildId, $severity, $isNew); diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 69402ad49..87a2d0e36 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -141,7 +141,7 @@ protected function getLatestBuilds($projectId, $branch) $builds = $this->buildStore->getWhere($criteria, 10, 0, $order); foreach ($builds['items'] as &$build) { - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); } return $builds['items']; diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index e619ef38c..1fc455822 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -367,7 +367,7 @@ protected function getLatestBuildsHtml($projectId, $branch = '', $environment = $view = new View('Project/ajax-builds'); foreach ($builds['items'] as &$build) { - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); } $view->builds = $builds['items']; diff --git a/src/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php index 9c2346fed..18de9418f 100644 --- a/src/Controller/WidgetLastBuildsController.php +++ b/src/Controller/WidgetLastBuildsController.php @@ -36,7 +36,7 @@ public function index() $builds = $this->buildStore->getLatestBuilds(null, 10); foreach ($builds as &$build) { - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); } $view = new View('WidgetLastBuilds/update'); @@ -58,7 +58,7 @@ public function update() $builds = $this->buildStore->getLatestBuilds(null, 10); foreach ($builds as &$build) { - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); } $this->view->builds = $builds; diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 17e05c194..68a2edbd2 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -119,7 +119,7 @@ public function createBuild( if (!empty($buildId)) { $project = $build->getProject(); - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); $build->sendStatusPostback(); $this->addBuildToQueue( $build, @@ -269,7 +269,7 @@ public function createDuplicateBuild(Build $originalBuild, $source) $buildId = $build->getId(); if (!empty($buildId)) { - $build = BuildFactory::getBuild($this->configuration, $build); + $build = BuildFactory::getBuild($this->configuration, $this->storeRegistry, $build); $project = $build->getProject(); $build->sendStatusPostback(); $this->addBuildToQueue( diff --git a/src/Store.php b/src/Store.php index 1a02fb34d..f2e44e42b 100644 --- a/src/Store.php +++ b/src/Store.php @@ -110,7 +110,7 @@ public function getWhere( $rtn = []; foreach ($res as $data) { - $rtn[] = new $this->modelName($data); + $rtn[] = new $this->modelName($this->storeRegistry, $data); } return ['items' => $rtn, 'count' => $count]; From b274e3e3aec9571b977f8f3483fb83b4efde93fa Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 30 May 2021 23:17:47 +0700 Subject: [PATCH 015/212] Updated dependencies. --- composer.json | 2 +- composer.lock | 147 +++++++++++++++++++++++++------------------------- 2 files changed, 73 insertions(+), 76 deletions(-) diff --git a/composer.json b/composer.json index f299e4ccd..ec1f386e3 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "ext-curl": "*", "ext-bcmath": "*", - "php-censor/common": "dev-master", + "php-censor/common": "^1.0", "swiftmailer/swiftmailer": "^6.2", "symfony/yaml": "^4.4", diff --git a/composer.lock b/composer.lock index 6d028e553..acbeb7836 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dd218b940a7209cfbb51dbfe3a08f7c2", + "content-hash": "e7a2957b929ed6f558fa4a7af5a19fcd", "packages": [ { "name": "cakephp/core", @@ -885,7 +885,7 @@ }, { "name": "php-censor/common", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/php-censor/common.git", @@ -908,7 +908,6 @@ "phpunit/phpunit": "^7.5", "vimeo/psalm": "^3.16" }, - "default-branch": true, "type": "library", "extra": { "platform": { @@ -2489,16 +2488,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -2510,7 +2509,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2548,7 +2547,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" }, "funding": [ { @@ -2564,20 +2563,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", "shasum": "" }, "require": { @@ -2589,7 +2588,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2628,7 +2627,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" }, "funding": [ { @@ -2644,20 +2643,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", "shasum": "" }, "require": { @@ -2669,7 +2668,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2709,7 +2708,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" }, "funding": [ { @@ -2725,20 +2724,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", "shasum": "" }, "require": { @@ -2752,7 +2751,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2796,7 +2795,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" }, "funding": [ { @@ -2812,20 +2811,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -2837,7 +2836,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2880,7 +2879,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" }, "funding": [ { @@ -2896,20 +2895,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", "shasum": "" }, "require": { @@ -2921,7 +2920,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2960,7 +2959,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" }, "funding": [ { @@ -2976,20 +2975,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { @@ -2998,7 +2997,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3036,7 +3035,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" }, "funding": [ { @@ -3052,20 +3051,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { @@ -3074,7 +3073,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3115,7 +3114,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, "funding": [ { @@ -3131,20 +3130,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", "shasum": "" }, "require": { @@ -3153,7 +3152,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3198,7 +3197,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" }, "funding": [ { @@ -3214,7 +3213,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/process", @@ -3760,16 +3759,16 @@ "packages-dev": [ { "name": "composer/semver", - "version": "3.2.4", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464" + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", - "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", + "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", + "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", "shasum": "" }, "require": { @@ -3821,7 +3820,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.4" + "source": "https://github.com/composer/semver/tree/3.2.5" }, "funding": [ { @@ -3837,7 +3836,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:59:24+00:00" + "time": "2021-05-24T12:41:47+00:00" }, { "name": "composer/xdebug-handler", @@ -7000,9 +6999,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "php-censor/common": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From 3b048b20b5f2db0f65ea7392d8570117a52d08c6 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 4 Jun 2021 23:27:34 +0700 Subject: [PATCH 016/212] Refactoring: Data types etc. --- bin/console | 6 +- public/index.php | 9 +- src/Application.php | 69 ++++----- src/BuildFactory.php | 7 + src/Builder.php | 140 ++++++------------ src/Console/Application.php | 7 - src/Controller.php | 36 ++--- src/Controller/BuildController.php | 26 +--- src/Controller/BuildStatusController.php | 21 +-- src/Controller/GroupController.php | 16 +- src/Controller/HomeController.php | 10 +- src/Controller/ProjectController.php | 31 ++-- src/Controller/SessionController.php | 21 +-- src/Controller/UserController.php | 21 +-- src/Controller/WebhookController.php | 24 +-- .../WidgetAllProjectsController.php | 22 +-- .../WidgetBuildErrorsController.php | 17 +-- src/Controller/WidgetLastBuildsController.php | 12 +- src/Logging/AnsiFormatter.php | 6 + src/Logging/BuildDBLogHandler.php | 32 ++-- src/Logging/BuildLogger.php | 6 + src/Logging/Handler.php | 66 +++------ src/Logging/OutputLogHandler.php | 14 +- src/Model.php | 6 + src/Plugin.php | 4 + .../LoginPasswordProviderInterface.php | 8 +- src/Security/Authentication/Service.php | 10 +- .../UserProvider/AbstractProvider.php | 6 +- .../Authentication/UserProvider/Internal.php | 12 +- .../Authentication/UserProvider/Ldap.php | 26 ++-- .../Authentication/UserProviderInterface.php | 10 +- src/Service/BuildService.php | 7 + src/Service/BuildStatusService.php | 37 ++--- src/Service/ProjectService.php | 7 + src/Service/UserService.php | 11 +- src/Store.php | 53 +++---- src/Store/BuildErrorStore.php | 33 ++--- src/Store/BuildErrorWriter.php | 5 +- src/Store/BuildMetaStore.php | 25 ++-- src/Store/BuildStore.php | 23 ++- src/Store/EnvironmentStore.php | 25 ++-- src/Store/ProjectGroupStore.php | 25 ++-- src/Store/ProjectStore.php | 23 ++- src/Store/UserStore.php | 23 ++- src/StoreRegistry.php | 7 + src/View.php | 67 +++------ src/WebController.php | 47 +++--- src/Worker/BuildWorker.php | 62 ++++---- src/ZeroConfigPluginInterface.php | 4 + tests/src/Plugin/PhpUnitTest.php | 9 +- .../Security/Authentication/ServiceTest.php | 2 +- 51 files changed, 552 insertions(+), 644 deletions(-) diff --git a/bin/console b/bin/console index bec287c6f..91624c2bc 100644 --- a/bin/console +++ b/bin/console @@ -6,12 +6,12 @@ use PHPCensor\Console\Application; use PHPCensor\DatabaseManager; use PHPCensor\StoreRegistry; -error_reporting(-1); -ini_set('display_errors', 1); +\error_reporting(-1); +\ini_set('display_errors', 1); /** @var $configuration ConfigurationInterface */ /** @var $databaseManager DatabaseManager */ /** @var $storeRegistry StoreRegistry */ -require_once(dirname(__DIR__) . '/bootstrap.php'); +require_once(\dirname(__DIR__) . '/bootstrap.php'); (new Application($configuration, $databaseManager, $storeRegistry))->run(); diff --git a/public/index.php b/public/index.php index 0822def82..5089c400c 100644 --- a/public/index.php +++ b/public/index.php @@ -3,13 +3,16 @@ use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\StoreRegistry; +use PHPCensor\Application; +use PHPCensor\Http\Request; \session_start(); /** @var $configuration ConfigurationInterface */ /** @var $databaseManager DatabaseManager */ /** @var $storeRegistry StoreRegistry */ -require_once(dirname(__DIR__) . '/bootstrap.php'); +require_once(\dirname(__DIR__) . '/bootstrap.php'); -$fc = new PHPCensor\Application($configuration, $databaseManager, $storeRegistry, new PHPCensor\Http\Request()); -print $fc->handleRequest(); +$application = new Application($configuration, $storeRegistry, new Request()); + +echo $application->handleRequest(); diff --git a/src/Application.php b/src/Application.php index 5793b600a..947fa3518 100644 --- a/src/Application.php +++ b/src/Application.php @@ -1,5 +1,7 @@ + * @author Dmitry Khomutov */ class Application { @@ -25,24 +31,20 @@ class Application private ConfigurationInterface $configuration; - private DatabaseManager $databaseManager; - private StoreRegistry $storeRegistry; private Router $router; public function __construct( ConfigurationInterface $configuration, - DatabaseManager $databaseManager, StoreRegistry $storeRegistry, ?Request $request = null ) { $this->configuration = $configuration; - $this->databaseManager = $databaseManager; $this->storeRegistry = $storeRegistry; $this->request = new Request(); - if (!is_null($request)) { + if (!\is_null($request)) { $this->request = $request; } @@ -54,7 +56,7 @@ public function __construct( /** * Initialise Application - Handles session verification, routing, etc. */ - public function init() + public function init(): void { $request =& $this->request; $route = '/:controller/:action'; @@ -104,7 +106,7 @@ public function init() * * @throws NotFoundException */ - protected function handleRequestInner() + protected function handleRequestInner(): Response { $this->route = $this->router->dispatch(); @@ -132,9 +134,10 @@ protected function handleRequestInner() /** * @return User|null * + * @throws Common\Exception\RuntimeException * @throws HttpException */ - private function getUser() + private function getUser(): ?User { if (empty($_SESSION['php-censor-user-id'])) { return null; @@ -150,8 +153,11 @@ private function getUser() * Handle an incoming web request. * * @return Response + * + * @throws Common\Exception\RuntimeException + * @throws HttpException */ - public function handleRequest() + public function handleRequest(): Response { try { $response = $this->handleRequestInner(); @@ -184,7 +190,7 @@ public function handleRequest() * * @return Controller */ - protected function loadController($class) + protected function loadController(string $class): Controller { /** @var Controller $controller */ $controller = new $class($this->configuration, $this->storeRegistry, $this->request); @@ -198,6 +204,8 @@ protected function loadController($class) * Check whether we should skip auth (because it is disabled) * * @return bool + * + * @throws Common\Exception\RuntimeException */ protected function shouldSkipAuth(): bool { @@ -215,10 +223,7 @@ protected function shouldSkipAuth(): bool return false; } - /** - * @return Controller - */ - public function getController() + public function getController(): Controller { if (empty($this->controller)) { $controllerClass = $this->getControllerClass($this->route); @@ -228,22 +233,12 @@ public function getController() return $this->controller; } - /** - * @param array $route - * - * @return bool - */ - protected function controllerExists($route) + protected function controllerExists(array $route): bool { - return class_exists($this->getControllerClass($route)); + return \class_exists($this->getControllerClass($route)); } - /** - * @param array $route - * - * @return string - */ - protected function getControllerClass($route) + protected function getControllerClass(array $route): string { $namespace = $this->toPhpName($route['namespace']); $controller = $this->toPhpName($route['controller']); @@ -251,12 +246,7 @@ protected function getControllerClass($route) return 'PHPCensor\\' . $namespace . '\\' . $controller . 'Controller'; } - /** - * @param array $route - * - * @return bool - */ - public function isValidRoute(array $route) + public function isValidRoute(array $route): bool { if ($this->controllerExists($route)) { return true; @@ -265,16 +255,11 @@ public function isValidRoute(array $route) return false; } - /** - * @param string $string - * - * @return string - */ - protected function toPhpName($string) + protected function toPhpName(string $string): string { - $string = str_replace('-', ' ', $string); - $string = ucwords($string); + $string = \str_replace('-', ' ', $string); + $string = \ucwords($string); - return str_replace(' ', '', $string); + return \str_replace(' ', '', $string); } } diff --git a/src/BuildFactory.php b/src/BuildFactory.php index 3b4158176..198ff92ca 100644 --- a/src/BuildFactory.php +++ b/src/BuildFactory.php @@ -1,5 +1,7 @@ + * @author Dmitry Khomutov */ class BuildFactory { @@ -19,6 +25,7 @@ class BuildFactory * * @return Build|null * + * @throws Common\Exception\RuntimeException * @throws Exception\HttpException */ public static function getBuildById( diff --git a/src/Builder.php b/src/Builder.php index 92b7c6e78..187dc8aea 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -1,12 +1,14 @@ + * @author Dmitry Khomutov */ class Builder { - /** - * @var string - */ - public $buildPath; + public string $buildPath = ''; /** * @var string[] */ - public $ignore = []; + public array $ignore = []; - /** - * @var string[] - */ - public $binaryPath = ''; + public string $binaryPath = ''; - /** - * @var string[] - */ - public $priorityPath = 'local'; + public string $priorityPath = 'local'; - /** - * @var string - */ - public $directory; + public string $directory = ''; - /** - * @var string|null - */ - protected $currentStage = null; + protected ?string $currentStage = null; - /** - * @var bool - */ - protected $verbose = true; + protected bool $verbose = true; - /** - * @var Build - */ - protected $build; + protected Build $build; - /** - * @var LoggerInterface - */ - protected $logger; + protected LoggerInterface $logger; - /** - * @var array - */ - protected $config = []; + protected array $config = []; - /** - * @var BuildInterpolator - */ - protected $interpolator; + protected BuildInterpolator $interpolator; - /** - * @var BuildStore - */ - protected $store; + protected BuildStore $store; - /** - * @var Executor - */ - protected $pluginExecutor; + protected Executor $pluginExecutor; - /** - * @var Helper\CommandExecutorInterface - */ - protected $commandExecutor; + protected CommandExecutorInterface $commandExecutor; - /** - * @var Logging\BuildLogger - */ - protected $buildLogger; + protected BuildLogger $buildLogger; - /** - * @var BuildErrorWriter - */ - private $buildErrorWriter; + private BuildErrorWriter $buildErrorWriter; private ConfigurationInterface $configuration; @@ -119,13 +80,14 @@ public function __construct( $this->storeRegistry = $storeRegistry; $this->build = $build; - $this->store = $this->storeRegistry->get('Build'); + + /** @var BuildStore $buildStore */ + $buildStore = $this->storeRegistry->get('Build'); + $this->store = $buildStore; $this->buildLogger = new BuildLogger($logger, $build); $pluginFactory = $this->buildPluginFactory($build); - /** @var BuildStore $buildStore */ - $buildStore = $this->storeRegistry->get('Build'); $this->pluginExecutor = new Plugin\Util\Executor( $this->storeRegistry, $pluginFactory, @@ -170,7 +132,7 @@ public function getCurrentStage(): ?string * * @param array $config */ - public function setConfig(array $config) + public function setConfig(array $config): void { $this->config = $config; } @@ -178,11 +140,11 @@ public function setConfig(array $config) /** * Access a variable from the .php-censor.yml file. * - * @param string $key + * @param string|null $key * * @return mixed */ - public function getConfig($key = null) + public function getConfig(?string $key = null) { $value = null; if (null === $key) { @@ -201,12 +163,12 @@ public function getConfig($key = null) * * @return mixed */ - public function getSystemConfig($key) + public function getSystemConfig(string $key) { return $this->configuration->get($key); } - public function execute() + public function execute(): void { $this->build->setStatusRunning(); $this->build->setStartDate(new DateTime()); @@ -307,7 +269,7 @@ public function execute() $this->store->save($this->build); } - protected function setErrorTrend() + protected function setErrorTrend(): void { $this->build->setErrorsTotal($this->store->getErrorsCount($this->build->getId())); @@ -333,11 +295,11 @@ protected function setErrorTrend() /** * Used by this class, and plugins, to execute shell commands. * - * @param string ...$params + * @param ...$params * * @return bool */ - public function executeCommand(...$params) + public function executeCommand(...$params): bool { return $this->commandExecutor->executeCommand($params); } @@ -347,7 +309,7 @@ public function executeCommand(...$params) * * @return string */ - public function getLastOutput() + public function getLastOutput(): string { return $this->commandExecutor->getLastOutput(); } @@ -357,7 +319,7 @@ public function getLastOutput() * * @param bool $enableLog */ - public function logExecOutput($enableLog = true) + public function logExecOutput(bool $enableLog = true): void { $this->commandExecutor->logExecOutput = $enableLog; } @@ -369,11 +331,12 @@ public function logExecOutput($enableLog = true) * @param string $priorityPath * @param string $binaryPath * @param array $binaryName + * * @return string * * @throws Exception when no binary has been found. */ - public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $binaryName = []) + public function findBinary($binary, string $priorityPath = 'local', string $binaryPath = '', array $binaryName = []): string { return $this->commandExecutor->findBinary($binary, $priorityPath, $binaryPath, $binaryName); } @@ -386,7 +349,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ * * @return string */ - public function interpolate($input) + public function interpolate(string $input): string { return $this->interpolator->interpolate($input); } @@ -398,9 +361,9 @@ public function interpolate($input) * * @return bool */ - protected function setupBuild() + protected function setupBuild(): bool { - $this->buildPath = $this->build->getBuildPath(); + $this->buildPath = (string)$this->build->getBuildPath(); $this->commandExecutor->setBuildPath($this->buildPath); @@ -434,14 +397,14 @@ protected function setupBuild() } if (!empty($this->config['build_settings']['binary_path'])) { - $this->binaryPath = rtrim( + $this->binaryPath = \rtrim( $this->interpolate($this->config['build_settings']['binary_path']), '/\\' ) . '/'; } if (!empty($this->config['build_settings']['priority_path']) && - in_array( + \in_array( $this->config['build_settings']['priority_path'], Plugin::AVAILABLE_PRIORITY_PATHS, true @@ -456,12 +419,12 @@ protected function setupBuild() $directory = $this->config['build_settings']['directory']; } - $this->directory = rtrim( + $this->directory = \rtrim( $this->interpolate($directory), '/\\' ) . '/'; - $this->buildLogger->logSuccess(sprintf('Working copy created: %s', $this->buildPath)); + $this->buildLogger->logSuccess(\sprintf('Working copy created: %s', $this->buildPath)); if (!$workingCopySuccess) { throw new RuntimeException('Could not create a working copy.'); @@ -502,17 +465,12 @@ public function logDebug(string $message): void * * @return PluginFactory */ - private function buildPluginFactory(Build $build) + private function buildPluginFactory(Build $build): PluginFactory { - $pluginFactory = new PluginFactory($this, $build); - - return $pluginFactory; + return new PluginFactory($this, $build); } - /** - * @return BuildErrorWriter - */ - public function getBuildErrorWriter() + public function getBuildErrorWriter(): BuildErrorWriter { return $this->buildErrorWriter; } diff --git a/src/Console/Application.php b/src/Console/Application.php index b0ca7a1d8..179d1eb00 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -85,13 +85,6 @@ protected function initLogger(ConfigurationInterface $applicationConfig): Logger return $logger; } - /** - * @param ConfigurationInterface $configuration - * @param string $name - * @param string $version - * - * @throws Exception - */ public function __construct( ConfigurationInterface $configuration, DatabaseManager $databaseManager, diff --git a/src/Controller.php b/src/Controller.php index 30e822c59..a8a2a58e2 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -1,15 +1,20 @@ + */ abstract class Controller { - /** - * @var Request - */ protected Request $request; protected ConfigurationInterface $configuration; @@ -29,20 +34,15 @@ public function __construct( /** * Initialise the controller. */ - abstract public function init(); + abstract public function init(): void; - /** - * @param string $name - * - * @return bool - */ - public function hasAction($name) + public function hasAction(string $name): bool { - if (method_exists($this, $name)) { + if (\method_exists($this, $name)) { return true; } - if (method_exists($this, '__call')) { + if (\method_exists($this, '__call')) { return true; } @@ -57,9 +57,9 @@ public function hasAction($name) * * @return Response */ - public function handleAction($action, $actionParams) + public function handleAction(string $action, array $actionParams): Response { - return call_user_func_array([$this, $action], $actionParams); + return \call_user_func_array([$this, $action], $actionParams); } /** @@ -67,7 +67,7 @@ public function handleAction($action, $actionParams) * * @return array */ - public function getParams() + public function getParams(): array { return $this->request->getParams(); } @@ -80,7 +80,7 @@ public function getParams() * * @return mixed */ - public function getParam($key, $default = null) + public function getParam(string $key, $default = null) { return $this->request->getParam($key, $default); } @@ -91,7 +91,7 @@ public function getParam($key, $default = null) * @param string $key * @param mixed $value */ - public function setParam($key, $value) + public function setParam(string $key, $value) { $this->request->setParam($key, $value); } @@ -101,7 +101,7 @@ public function setParam($key, $value) * * @param string $key */ - public function unsetParam($key) + public function unsetParam(string $key): void { $this->request->unsetParam($key); } diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index c61095a52..945d041e5 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -19,33 +19,23 @@ use SensioLabs\AnsiConverter\AnsiToHtmlConverter; /** - * Build Controller - Allows users to run and view builds. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class BuildController extends WebController { - /** - * @var string - */ - public $layoutName = 'layout'; + public string $layoutName = 'layout'; - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 87a2d0e36..376c7f3df 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -18,26 +18,19 @@ use SimpleXMLElement; /** - * Build Status Controller - Allows external access to build status information / images. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class BuildStatusController extends WebController { - /** - * @var string - */ - public $layoutName = 'layoutPublic'; + public string $layoutName = 'layoutPublic'; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; /** * Returns status of the last build @@ -147,7 +140,7 @@ protected function getLatestBuilds($projectId, $branch) return $builds['items']; } - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php index 6d84479b5..21468b100 100644 --- a/src/Controller/GroupController.php +++ b/src/Controller/GroupController.php @@ -12,23 +12,19 @@ use PHPCensor\WebController; /** - * Project Controller - Allows users to create, edit and view projects. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class GroupController extends WebController { - /** - * @var string - */ - public $layoutName = 'layout'; + public string $layoutName = 'layout'; - /** - * @var ProjectGroupStore - */ - protected $groupStore; + protected ProjectGroupStore $groupStore; - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index 3b0b8da0c..b56a82cbe 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -6,14 +6,14 @@ use PHPCensor\WebController; /** - * Home Controller - Displays the Dashboard. + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class HomeController extends WebController { - /** - * @var string - */ - public $layoutName = 'layout'; + public string $layoutName = 'layout'; /** * Display dashboard: diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 1fc455822..328561e5a 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -23,41 +23,28 @@ use PHPCensor\Common\Exception\RuntimeException; /** - * Project Controller - Allows users to create, edit and view projects. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class ProjectController extends WebController { - /** - * @var string - */ - public $layoutName = 'layout'; + public string $layoutName = 'layout'; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var ProjectService - */ - protected $projectService; + protected ProjectService $projectService; - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index 5fac62638..af84fe22d 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -17,31 +17,24 @@ use PHPCensor\WebController; /** - * Session Controller - Handles user login / logout. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class SessionController extends WebController { - /** - * @var string - */ - public $layoutName = 'layoutSession'; + public string $layoutName = 'layoutSession'; - /** - * @var UserStore - */ - protected $userStore; + protected UserStore $userStore; - /** - * @var Service - */ - protected $authentication; + protected Service $authentication; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index dbc6b0de9..793a620b7 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -14,31 +14,24 @@ use PHPCensor\WebController; /** - * User Controller - Allows an administrator to view, add, edit and delete users. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer + * @author Dmitry Khomutov */ class UserController extends WebController { - /** - * @var string - */ - public $layoutName = 'layout'; + public string $layoutName = 'layout'; - /** - * @var UserStore - */ - protected $userStore; + protected UserStore $userStore; - /** - * @var UserService - */ - protected $userService; + protected UserService $userService; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index 7ee767af7..1220ef7b3 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -22,35 +22,27 @@ use PHPCensor\Store\ProjectStore; /** - * Webhook Controller - Processes webhook pings from BitBucket, Github, Gitlab, Gogs, etc. + * @package PHP Censor + * @subpackage Application * * @author Dan Cryer * @author Sami Tikka * @author Alex Russell * @author Guillaume Perréal - * + * @author Dmitry Khomutov */ class WebhookController extends Controller { - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var BuildService - */ - protected $buildService; + protected BuildService $buildService; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { $this->buildStore = $this->storeRegistry->get('Build'); $this->projectStore = $this->storeRegistry->get('Project'); @@ -71,7 +63,7 @@ public function init() * * @return Response */ - public function handleAction($action, $actionParams) + public function handleAction(string $action, array $actionParams): Response { $response = new Response\JsonResponse(); try { diff --git a/src/Controller/WidgetAllProjectsController.php b/src/Controller/WidgetAllProjectsController.php index 4d74838c0..595cb3f34 100644 --- a/src/Controller/WidgetAllProjectsController.php +++ b/src/Controller/WidgetAllProjectsController.php @@ -14,29 +14,23 @@ use PHPCensor\WebController; /** - * Widget All Projects Controller + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class WidgetAllProjectsController extends WebController { - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; - /** - * @var ProjectGroupStore - */ - protected $groupStore; + protected ProjectGroupStore $groupStore; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/WidgetBuildErrorsController.php b/src/Controller/WidgetBuildErrorsController.php index 768af50d6..f989d2979 100644 --- a/src/Controller/WidgetBuildErrorsController.php +++ b/src/Controller/WidgetBuildErrorsController.php @@ -10,24 +10,21 @@ use PHPCensor\WebController; /** - * Widget Build Errors Controller + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class WidgetBuildErrorsController extends WebController { - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; - /** - * @var ProjectStore - */ - protected $projectStore; + protected ProjectStore $projectStore; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php index 18de9418f..b69c80c64 100644 --- a/src/Controller/WidgetLastBuildsController.php +++ b/src/Controller/WidgetLastBuildsController.php @@ -9,19 +9,19 @@ use PHPCensor\WebController; /** - * Widget Last Builds Controller + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class WidgetLastBuildsController extends WebController { - /** - * @var BuildStore - */ - protected $buildStore; + protected BuildStore $buildStore; /** * Initialise the controller, set up stores and services. */ - public function init() + public function init(): void { parent::init(); diff --git a/src/Logging/AnsiFormatter.php b/src/Logging/AnsiFormatter.php index 7ce67f41b..e2a4ccfd8 100644 --- a/src/Logging/AnsiFormatter.php +++ b/src/Logging/AnsiFormatter.php @@ -6,6 +6,12 @@ use Monolog\Formatter\LineFormatter; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class AnsiFormatter extends LineFormatter { /** diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index c243c67c2..403af9cdd 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -1,5 +1,7 @@ */ class BuildDBLogHandler extends AbstractProcessingHandler { @@ -19,22 +26,22 @@ class BuildDBLogHandler extends AbstractProcessingHandler protected BuildStore $buildStore; - protected $logValue; + protected string $logValue; /** * @var int last flush timestamp */ - protected $flushTimestamp = 0; + protected int $flushTimestamp = 0; /** * @var int flush delay, seconds */ - protected $flushDelay = 1; + protected int $flushDelay = 1; public function __construct( BuildStore $buildStore, Build $build, - $level = Logger::INFO, + int $level = Logger::INFO, bool $bubble = true ) { parent::__construct($level, $bubble); @@ -46,9 +53,6 @@ public function __construct( $this->logValue = $build->getLog(); } - /** - * Destructor - */ public function __destruct() { $this->flushData(); @@ -57,27 +61,29 @@ public function __destruct() /** * Flush buffered data */ - protected function flushData() + protected function flushData(): void { $this->build->setLog($this->logValue); $this->buildStore->save($this->build); - $this->flushTimestamp = time(); + + $this->flushTimestamp = \time(); } /** * Write a log entry to the build log. + * * @param array $record */ protected function write(array $record): void { $message = (string)$record['message']; - $message = str_replace(['\/', '//'], '/', $message); - $message = str_replace($this->build->getBuildPath(), '/', $message); - $message = str_replace(ROOT_DIR, '/', $message); + $message = \str_replace(['\/', '//'], '/', $message); + $message = \str_replace($this->build->getBuildPath(), '/', $message); + $message = \str_replace(ROOT_DIR, '/', $message); $this->logValue .= $message . PHP_EOL; - if ($this->flushTimestamp < (time() - $this->flushDelay)) { + if ($this->flushTimestamp < (\time() - $this->flushDelay)) { $this->flushData(); } } diff --git a/src/Logging/BuildLogger.php b/src/Logging/BuildLogger.php index b1d87da47..45d7dce02 100644 --- a/src/Logging/BuildLogger.php +++ b/src/Logging/BuildLogger.php @@ -8,6 +8,12 @@ use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BuildLogger { private LoggerInterface $logger; diff --git a/src/Logging/Handler.php b/src/Logging/Handler.php index b1ed6ad7d..ddc98776f 100644 --- a/src/Logging/Handler.php +++ b/src/Logging/Handler.php @@ -1,5 +1,7 @@ */ class Handler { - /** - * @var array - */ - protected $levels = [ + protected array $levels = [ E_WARNING => 'Warning', E_NOTICE => 'Notice', E_USER_ERROR => 'User Error', @@ -26,48 +28,38 @@ class Handler E_USER_DEPRECATED => 'User Deprecated', ]; - /** - * @var LoggerInterface - */ - protected $logger; + protected ?LoggerInterface $logger; - /** - * @param LoggerInterface $logger - */ - public function __construct(LoggerInterface $logger = null) + public function __construct(?LoggerInterface $logger = null) { $this->logger = $logger; } - /** - * Register a new log handler. - * @param LoggerInterface $logger - */ - public static function register(LoggerInterface $logger = null) + public static function register(?LoggerInterface $logger = null): void { $handler = new static($logger); - set_error_handler([$handler, 'handleError']); - register_shutdown_function([$handler, 'handleFatalError']); + \set_error_handler([$handler, 'handleError']); + \register_shutdown_function([$handler, 'handleFatalError']); - set_exception_handler([$handler, 'handleException']); + \set_exception_handler([$handler, 'handleException']); } /** - * @param int $level + * @param int $level * @param string $message * @param string $file - * @param int $line + * @param int $line * * @throws ErrorException */ - public function handleError($level, $message, $file, $line) + public function handleError(int $level, string $message, string $file, int $line): void { - if (error_reporting() & $level) { - $exceptionLevel = isset($this->levels[$level]) ? $this->levels[$level] : $level; + if (\error_reporting() & $level) { + $exceptionLevel = $this->levels[$level] ?? $level; throw new ErrorException( - sprintf('%s: %s in %s line %d', $exceptionLevel, $message, $file, $line), + \sprintf('%s: %s in %s line %d', $exceptionLevel, $message, $file, $line), 0, $level, $file, @@ -76,10 +68,7 @@ public function handleError($level, $message, $file, $line) } } - /** - * @throws ErrorException - */ - public function handleFatalError() + public function handleFatalError(): void { $fatalError = \error_get_last(); @@ -118,24 +107,17 @@ public function handleFatalError() } } - /** - * @param $exception - */ - public function handleException($exception) + public function handleException(\Throwable $exception): void { $this->log($exception); } - /** - * Write to the build log. - * @param $exception - */ - protected function log($exception) + protected function log(\Throwable $exception): void { if (null !== $this->logger) { - $message = sprintf( + $message = \sprintf( '%s: %s (uncaught exception) at %s line %s', - get_class($exception), + \get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine() diff --git a/src/Logging/OutputLogHandler.php b/src/Logging/OutputLogHandler.php index f2dabe98e..71d834295 100644 --- a/src/Logging/OutputLogHandler.php +++ b/src/Logging/OutputLogHandler.php @@ -10,22 +10,24 @@ /** * Class OutputLogHandler outputs the build log to the terminal. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class OutputLogHandler extends AbstractProcessingHandler { - /** - * @var OutputInterface - */ - protected $output; + protected OutputInterface $output; /** * @param OutputInterface $output - * @param int|string $level + * @param string $level * @param bool $bubble */ public function __construct( OutputInterface $output, - $level = LogLevel::INFO, + string $level = LogLevel::INFO, bool $bubble = true ) { parent::__construct($level, $bubble); diff --git a/src/Model.php b/src/Model.php index 3f9eb3a66..365149e2a 100644 --- a/src/Model.php +++ b/src/Model.php @@ -4,6 +4,12 @@ namespace PHPCensor; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Model { protected array $data = []; diff --git a/src/Plugin.php b/src/Plugin.php index 7e2c43ac6..b27b09aee 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -6,7 +6,11 @@ use PHPCensor\Model\Build; /** + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ abstract class Plugin { diff --git a/src/Security/Authentication/LoginPasswordProviderInterface.php b/src/Security/Authentication/LoginPasswordProviderInterface.php index 5f8a8830b..5f42e1f29 100644 --- a/src/Security/Authentication/LoginPasswordProviderInterface.php +++ b/src/Security/Authentication/LoginPasswordProviderInterface.php @@ -1,13 +1,19 @@ + * @author Dmitry Khomutov */ interface LoginPasswordProviderInterface extends UserProviderInterface { diff --git a/src/Security/Authentication/Service.php b/src/Security/Authentication/Service.php index 9f225d8e6..ba2ae7489 100644 --- a/src/Security/Authentication/Service.php +++ b/src/Security/Authentication/Service.php @@ -1,14 +1,18 @@ + * @author Dmitry Khomutov */ class Service { @@ -58,7 +62,7 @@ public static function buildProvider(StoreRegistry $storeRegistry, string $key, * * @return UserProviderInterface[] */ - public function getProviders() + public function getProviders(): array { return $this->providers; } @@ -68,7 +72,7 @@ public function getProviders() * * @return LoginPasswordProviderInterface[] */ - public function getLoginPasswordProviders() + public function getLoginPasswordProviders(): array { $providers = []; foreach ($this->providers as $key => $provider) { diff --git a/src/Security/Authentication/UserProvider/AbstractProvider.php b/src/Security/Authentication/UserProvider/AbstractProvider.php index c2e1f571f..0096a8966 100644 --- a/src/Security/Authentication/UserProvider/AbstractProvider.php +++ b/src/Security/Authentication/UserProvider/AbstractProvider.php @@ -1,14 +1,18 @@ + * @author Dmitry Khomutov */ abstract class AbstractProvider implements UserProviderInterface { diff --git a/src/Security/Authentication/UserProvider/Internal.php b/src/Security/Authentication/UserProvider/Internal.php index 82dafe2ec..d2c121b42 100644 --- a/src/Security/Authentication/UserProvider/Internal.php +++ b/src/Security/Authentication/UserProvider/Internal.php @@ -1,14 +1,18 @@ + * @author Dmitry Khomutov */ class Internal extends AbstractProvider implements LoginPasswordProviderInterface { @@ -23,15 +27,15 @@ public function verifyPassword(User $user, string $password): bool return password_verify($password, $user->getHash()); } - public function checkRequirements() + public function checkRequirements(): void { // Always fine } /** - * @param string $identifier + * @param string|null $identifier * - * @return null + * @return User|null */ public function provisionUser(?string $identifier): ?User { diff --git a/src/Security/Authentication/UserProvider/Ldap.php b/src/Security/Authentication/UserProvider/Ldap.php index 72af93401..9c30aa37d 100644 --- a/src/Security/Authentication/UserProvider/Ldap.php +++ b/src/Security/Authentication/UserProvider/Ldap.php @@ -1,5 +1,7 @@ */ class Ldap extends AbstractProvider implements LoginPasswordProviderInterface { @@ -30,44 +34,46 @@ public function verifyPassword(User $user, string $password): bool $ldapMail = !empty($ldapData['mail_attribute']) ? $ldapData['mail_attribute'] : 'mail'; if ($ldapPort) { - $ldap = @ldap_connect($ldapHost, $ldapPort); + $ldap = @\ldap_connect($ldapHost, $ldapPort); } else { - $ldap = @ldap_connect($ldapHost); + $ldap = @\ldap_connect($ldapHost); } if (false === $ldap) { return false; } - ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); + \ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - $ls = @ldap_search($ldap, $ldapBaseDn, $ldapMail . '=' . $user->getEmail()); + $ls = @\ldap_search($ldap, $ldapBaseDn, $ldapMail . '=' . $user->getEmail()); if (false === $ls) { return false; } - $le = @ldap_get_entries($ldap, $ls); + $le = @\ldap_get_entries($ldap, $ls); if (!$le['count']) { return false; } $dn = $le[0]['dn']; - return @ldap_bind($ldap, $dn, $password); + return @\ldap_bind($ldap, $dn, $password); } return false; } - public function checkRequirements() + public function checkRequirements(): void { // Always fine } /** - * @param string $identifier + * @param string|null $identifier + * + * @return User|null * - * @return User + * @throws \PHPCensor\Common\Exception\RuntimeException */ public function provisionUser(?string $identifier): ?User { diff --git a/src/Security/Authentication/UserProviderInterface.php b/src/Security/Authentication/UserProviderInterface.php index 764041cf2..9546a691d 100644 --- a/src/Security/Authentication/UserProviderInterface.php +++ b/src/Security/Authentication/UserProviderInterface.php @@ -1,14 +1,18 @@ + * @author Dmitry Khomutov */ interface UserProviderInterface { @@ -18,12 +22,12 @@ interface UserProviderInterface * * @throws Exception */ - public function checkRequirements(); + public function checkRequirements(): void; /** * Provision an new user for the given identifier. * - * @param string $identifier The user identifier. + * @param string|null $identifier The user identifier. * * @return User|null The new user or null if the provider does not know the user. */ diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 68a2edbd2..f107710c2 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -1,5 +1,7 @@ */ class BuildService { diff --git a/src/Service/BuildStatusService.php b/src/Service/BuildStatusService.php index fa1f27d86..d1a703776 100644 --- a/src/Service/BuildStatusService.php +++ b/src/Service/BuildStatusService.php @@ -1,5 +1,7 @@ */ class BuildStatusService { - /** - * @var BuildStatusService - */ - protected $prevService = null; + private ?BuildStatusService $prevService = null; - /** - * @var Project - */ - protected $project; + private Project $project; - /** - * @var string - */ - protected $branch; + private string $branch; - /** - * @var Build - */ - protected $build; + private Build $build; - /** - * @var string - */ - protected $url; + private string $url; - /** - * @var array - */ - protected $finishedStatusIds = [ + private array $finishedStatusIds = [ Build::STATUS_SUCCESS, Build::STATUS_FAILED, ]; diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index 4a48f3773..227a61f14 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -1,5 +1,7 @@ */ class ProjectService { diff --git a/src/Service/UserService.php b/src/Service/UserService.php index 8c473e14a..5d8f322d1 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -1,5 +1,7 @@ */ class UserService { - protected UserStore $store; + private UserStore $store; - protected StoreRegistry $storeRegistry; + private StoreRegistry $storeRegistry; public function __construct( StoreRegistry $storeRegistry, diff --git a/src/Store.php b/src/Store.php index f2e44e42b..d267b56ba 100644 --- a/src/Store.php +++ b/src/Store.php @@ -1,5 +1,7 @@ + */ abstract class Store { - /** - * @var string - */ - protected $modelName = null; + protected ?string $modelName = null; - /** - * @var string - */ - protected $tableName = ''; + protected string $tableName = ''; - /** - * @var string - */ - protected $primaryKey = null; + protected ?string $primaryKey = null; protected DatabaseManager $databaseManager; protected StoreRegistry $storeRegistry; - abstract public function getByPrimaryKey($key, $useConnection = 'read'); + abstract public function getByPrimaryKey($key, string $useConnection = 'read'): ?Model; /** * @throws RuntimeException @@ -54,15 +53,16 @@ public function __construct( * * @return array * + * @throws Common\Exception\Exception * @throws InvalidArgumentException */ public function getWhere( - $where = [], - $limit = 25, - $offset = 0, - $order = [], - $whereType = 'AND' - ) { + array $where = [], + int $limit = 25, + int $offset = 0, + array $order = [], + string $whereType = 'AND' + ): array { $query = 'SELECT * FROM {{' . $this->tableName . '}}'; $countQuery = 'SELECT COUNT(*) AS {{count}} FROM {{' . $this->tableName . '}}'; @@ -120,11 +120,11 @@ public function getWhere( * @param Model $obj * @param bool $saveAllColumns * - * @throws InvalidArgumentException - * * @return Model|null + * + * @throws InvalidArgumentException */ - public function save(Model $obj, $saveAllColumns = false) + public function save(Model $obj, bool $saveAllColumns = false): ?Model { if (!($obj instanceof $this->modelName)) { throw new InvalidArgumentException(get_class($obj) . ' is an invalid model type for this store.'); @@ -149,7 +149,7 @@ public function save(Model $obj, $saveAllColumns = false) * * @throws Exception */ - public function saveByUpdate(Model $obj, $saveAllColumns = false) + public function saveByUpdate(Model $obj, bool $saveAllColumns = false): ?Model { $data = $obj->getDataArray(); $modified = ($saveAllColumns) ? array_keys($data) : $obj->getModified(); @@ -193,7 +193,7 @@ public function saveByUpdate(Model $obj, $saveAllColumns = false) * * @throws Exception */ - public function saveByInsert(Model $obj, $saveAllColumns = false) + public function saveByInsert(Model $obj, bool $saveAllColumns = false): ?Model { $rtn = null; $data = $obj->getDataArray(); @@ -231,9 +231,10 @@ public function saveByInsert(Model $obj, $saveAllColumns = false) * * @return bool * + * @throws Common\Exception\Exception * @throws InvalidArgumentException */ - public function delete(Model $obj) + public function delete(Model $obj): bool { if (!($obj instanceof $this->modelName)) { throw new InvalidArgumentException(get_class($obj) . ' is an invalid model type for this store.'); @@ -262,7 +263,7 @@ public function delete(Model $obj) * * @throws InvalidArgumentException */ - protected function fieldCheck($field) + protected function fieldCheck(string $field): string { if (empty($field)) { throw new InvalidArgumentException('You cannot have an empty field name.'); diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 4e3cc5a67..e624e2601 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -1,5 +1,7 @@ + */ class BuildErrorStore extends Store { - /** - * @var string - */ - protected $tableName = 'build_errors'; + protected string $tableName = 'build_errors'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\BuildError'; + protected ?string $modelName = '\PHPCensor\Model\BuildError'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** - * Get a BuildError by primary key (Id) + * @param mixed $key + * @param string $useConnection * - * @param int $key - * @param string $useConnection + * @return BuildError|null * - * @return null|BuildError + * @throws HttpException */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildError { return $this->getById($key, $useConnection); } diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index cca7cb411..bed5e1521 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -11,7 +11,10 @@ use PHPCensor\StoreRegistry; /** - * Class BuildErrorWriter + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class BuildErrorWriter { diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 9b2e38f9b..254bf090f 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -1,5 +1,7 @@ + */ class BuildMetaStore extends Store { - /** - * @var string - */ - protected $tableName = 'build_metas'; + protected string $tableName = 'build_metas'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\BuildMeta'; + protected ?string $modelName = '\PHPCensor\Model\BuildMeta'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a BuildMeta by primary key (Id) @@ -32,7 +31,7 @@ class BuildMetaStore extends Store * * @return null|BuildMeta */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildMeta { return $this->getById($key, $useConnection); } diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index b5b73cf0d..3ceda08fb 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -1,5 +1,7 @@ + * @author Dmitry Khomutov */ class BuildStore extends Store { - /** - * @var string - */ - protected $tableName = 'builds'; + protected string $tableName = 'builds'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\Build'; + protected ?string $modelName = '\PHPCensor\Model\Build'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a Build by primary key (Id) @@ -37,7 +34,7 @@ class BuildStore extends Store * * @return null|Build */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?Build { return $this->getById($key, $useConnection); } diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 8d5f0717c..05401b660 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -1,5 +1,7 @@ + */ class EnvironmentStore extends Store { - /** - * @var string - */ - protected $tableName = 'environments'; + protected string $tableName = 'environments'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\Environment'; + protected ?string $modelName = '\PHPCensor\Model\Environment'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a Environment by primary key (Id) @@ -33,7 +32,7 @@ class EnvironmentStore extends Store * * @return null|Environment */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?Environment { return $this->getById($key, $useConnection); } diff --git a/src/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php index 6d74821fc..ab0360ecc 100644 --- a/src/Store/ProjectGroupStore.php +++ b/src/Store/ProjectGroupStore.php @@ -1,5 +1,7 @@ + */ class ProjectGroupStore extends Store { - /** - * @var string - */ - protected $tableName = 'project_groups'; + protected string $tableName = 'project_groups'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\ProjectGroup'; + protected ?string $modelName = '\PHPCensor\Model\ProjectGroup'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a ProjectGroup by primary key (Id) @@ -32,7 +31,7 @@ class ProjectGroupStore extends Store * * @return null|ProjectGroup */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?ProjectGroup { return $this->getById($key, $useConnection); } diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 4979fb829..25d50dc43 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -1,5 +1,7 @@ + * @author Dmitry Khomutov */ class ProjectStore extends Store { - /** - * @var string - */ - protected $tableName = 'projects'; + protected string $tableName = 'projects'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\Project'; + protected ?string $modelName = '\PHPCensor\Model\Project'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a Project by primary key (Id) @@ -36,7 +33,7 @@ class ProjectStore extends Store * * @return Project|null */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?Project { return $this->getById($key, $useConnection); } diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index fd1f571da..6b830be2a 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -1,5 +1,7 @@ + * @author Dmitry Khomutov */ class UserStore extends Store { - /** - * @var string - */ - protected $tableName = 'users'; + protected string $tableName = 'users'; - /** - * @var string - */ - protected $modelName = '\PHPCensor\Model\User'; + protected ?string $modelName = '\PHPCensor\Model\User'; - /** - * @var string - */ - protected $primaryKey = 'id'; + protected ?string $primaryKey = 'id'; /** * Get a User by primary key (Id) @@ -35,7 +32,7 @@ class UserStore extends Store * * @return null|User */ - public function getByPrimaryKey($key, $useConnection = 'read') + public function getByPrimaryKey($key, string $useConnection = 'read'): ?User { return $this->getById($key, $useConnection); } diff --git a/src/StoreRegistry.php b/src/StoreRegistry.php index 7f13363af..60aaac79e 100644 --- a/src/StoreRegistry.php +++ b/src/StoreRegistry.php @@ -28,6 +28,13 @@ public function __construct(DatabaseManager $databaseManager) $this->databaseManager = $databaseManager; } + /** + * @param string $storeName + * + * @return Store|null + * + * @throws RuntimeException + */ public function get(string $storeName): ?Store { if (!isset($this->loadedStores[$storeName])) { diff --git a/src/View.php b/src/View.php index f5740fa24..c71ac4776 100644 --- a/src/View.php +++ b/src/View.php @@ -1,31 +1,32 @@ + */ class View { - /** - * @var array - */ - protected $data = []; + protected array $data = []; - /** - * @var string - */ - protected $viewFile; + protected string $viewFile; - /** - * @var string - */ - protected static $extension = 'phtml'; + protected static string $extension = 'phtml'; /** * @param string $file * @param string|null $path + * + * @throws RuntimeException */ - public function __construct($file, $path = null) + public function __construct(string $file, ?string $path = null) { if (!self::exists($file, $path)) { throw new RuntimeException('View file does not exist: ' . $file); @@ -34,26 +35,14 @@ public function __construct($file, $path = null) $this->viewFile = self::getViewFile($file, $path); } - /** - * @param string $file - * @param string|null $path - * - * @return string - */ - protected static function getViewFile($file, $path = null) + protected static function getViewFile(string $file, ?string $path = null): string { $viewPath = is_null($path) ? (SRC_DIR . 'View/') : $path; return $viewPath . $file . '.' . static::$extension; } - /** - * @param string $file - * @param string|null $path - * - * @return bool - */ - public static function exists($file, $path = null) + public static function exists(string $file, ?string $path = null): bool { if (!file_exists(self::getViewFile($file, $path))) { return false; @@ -62,12 +51,7 @@ public static function exists($file, $path = null) return true; } - /** - * @param string $key - * - * @return bool - */ - public function __isset($key) + public function __isset(string $key): bool { return isset($this->data[$key]); } @@ -77,7 +61,7 @@ public function __isset($key) * * @return mixed */ - public function __get($key) + public function __get(string $key) { return $this->data[$key]; } @@ -86,24 +70,21 @@ public function __get($key) * @param string $key * @param mixed $value */ - public function __set($key, $value) + public function __set(string $key, $value): void { $this->data[$key] = $value; } - /** - * @return string - */ - public function render() + public function render(): string { - extract($this->data); + \extract($this->data); - ob_start(); + \ob_start(); require($this->viewFile); - $html = ob_get_contents(); - ob_end_clean(); + $html = \ob_get_contents(); + \ob_end_clean(); return $html; } diff --git a/src/WebController.php b/src/WebController.php index db7f6890f..ae4464a18 100644 --- a/src/WebController.php +++ b/src/WebController.php @@ -1,5 +1,7 @@ + */ abstract class WebController extends Controller { - /** - * @var string - */ - protected $className; + protected string $className; - /** - * @var View - */ - protected $view = null; + protected ?View $view = null; - /** - * @var string - */ - public $layoutName = ''; + public string $layoutName = ''; - /** - * @var View - */ - public $layout = null; + public ?View $layout = null; public function __construct( ConfigurationInterface $configuration, @@ -38,11 +34,11 @@ public function __construct( ) { parent::__construct($configuration, $storeRegistry, $request); - $class = explode('\\', get_class($this)); - $this->className = substr(array_pop($class), 0, -10); + $class = \explode('\\', \get_class($this)); + $this->className = \substr(\array_pop($class), 0, -10); } - public function init() + public function init(): void { if (!empty($this->layoutName)) { $this->layout = new View($this->layoutName); @@ -81,8 +77,10 @@ public function init() * @param array $actionParams * * @return Response + * + * @throws Common\Exception\RuntimeException */ - public function handleAction($action, $actionParams) + public function handleAction(string $action, array $actionParams): Response { if (View::exists($this->className . '/' . $action)) { $this->view = new View($this->className . '/' . $action); @@ -118,7 +116,7 @@ public function handleAction($action, $actionParams) * * @throws HttpException */ - protected function requireAdmin() + protected function requireAdmin(): void { if (!$this->currentUserIsAdmin()) { throw new ForbiddenException('You do not have permission to do that.'); @@ -130,11 +128,9 @@ protected function requireAdmin() * * @return bool * - * @return bool - * * @throws HttpException */ - protected function currentUserIsAdmin() + protected function currentUserIsAdmin(): bool { $user = $this->getUser(); if (!$user) { @@ -147,9 +143,10 @@ protected function currentUserIsAdmin() /** * @return User|null * + * @throws Common\Exception\RuntimeException * @throws HttpException */ - protected function getUser() + protected function getUser(): ?User { if (empty($_SESSION['php-censor-user-id'])) { return null; diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 3550f4c3b..848649371 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -19,10 +19,16 @@ use PHPCensor\Store\BuildStore; use PHPCensor\StoreRegistry; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BuildWorker { - const JOB_TYPE_BUILD = 'php-censor.build'; - const JOB_TYPE_STOP_FLAG = 'php-censor.stop-flag'; + public const JOB_TYPE_BUILD = 'php-censor.build'; + public const JOB_TYPE_STOP_FLAG = 'php-censor.stop-flag'; /** * If this variable changes to false, the worker will stop after the current build. @@ -77,19 +83,19 @@ public function __construct( $this->canPeriodicalWork = $canPeriodicalWork; } - public function stopWorker() + public function stopWorker(): void { $this->canRun = false; } - public function startWorker() + public function startWorker(): void { $this->canRun = true; $this->runWorker(); } - protected function runWorker() + protected function runWorker(): void { $this->pheanstalk->watchOnly($this->queueTube); @@ -100,13 +106,13 @@ protected function runWorker() } if ($this->canForceRewindLoop()) { - sleep(1); + \sleep(1); continue; } $job = $this->pheanstalk->reserve(); - $jobData = json_decode($job->getData(), true); + $jobData = \json_decode($job->getData(), true); if (!$this->verifyJob($job)) { $this->deleteJob($job); @@ -115,7 +121,7 @@ protected function runWorker() } $this->logger->notice( - sprintf( + \sprintf( 'Received build #%s from the queue tube "%s".', $jobData['build_id'], $this->queueTube @@ -130,7 +136,7 @@ protected function runWorker() if (!$build) { $this->logger->warning( - sprintf( + \sprintf( 'Build #%s from the queue tube "%s" does not exist in the database!', $jobData['build_id'], $this->queueTube @@ -144,7 +150,7 @@ protected function runWorker() if (Build::STATUS_PENDING !== $build->getStatus()) { $this->logger->warning( - sprintf( + \sprintf( 'Invalid build #%s status "%s" from the queue tube "%s". ' . 'Build status should be "%s" (pending)!', $build->getId(), @@ -179,7 +185,7 @@ protected function runWorker() } catch (Exception $e) { $builder->getBuildLogger()->log(''); $builder->getBuildLogger()->logFailure( - sprintf( + \sprintf( 'BUILD FAILED! Exception: %s', $e->getMessage() ), @@ -204,10 +210,7 @@ protected function runWorker() } } - /** - * @param Job $job - */ - protected function deleteJob(Job $job) + protected function deleteJob(Job $job): void { try { $this->pheanstalk->delete($job); @@ -216,13 +219,10 @@ protected function deleteJob(Job $job) } } - /** - * @return bool - */ - protected function canForceRewindLoop() + protected function canForceRewindLoop(): bool { try { - $this->pheanstalk->peekReady($this->queueTube); + $this->pheanstalk->peekReady(); } catch (Exception $e) { return true; } @@ -230,12 +230,9 @@ protected function canForceRewindLoop() return false; } - /** - * @return bool - */ - protected function canRunPeriodicalWork() + protected function canRunPeriodicalWork(): bool { - $currentTime = time(); + $currentTime = \time(); if (($this->lastPeriodical + 60) > $currentTime) { return false; } @@ -245,18 +242,13 @@ protected function canRunPeriodicalWork() return true; } - /** - * @param Job $job - * - * @return bool - */ - protected function verifyJob(Job $job) + protected function verifyJob(Job $job): bool { - $jobData = json_decode($job->getData(), true); + $jobData = \json_decode($job->getData(), true); - if (empty($jobData) || !is_array($jobData)) { + if (empty($jobData) || !\is_array($jobData)) { $this->logger->warning( - sprintf('Empty job (#%s) from the queue tube "%s"!', $job->getId(), $this->queueTube) + \sprintf('Empty job (#%s) from the queue tube "%s"!', $job->getId(), $this->queueTube) ); return false; @@ -272,7 +264,7 @@ protected function verifyJob(Job $job) return false; } elseif (self::JOB_TYPE_BUILD !== $jobType) { $this->logger->warning( - sprintf( + \sprintf( 'Invalid job (#%s) type "%s" in the queue tube "%s"!', $job->getId(), $jobType, diff --git a/src/ZeroConfigPluginInterface.php b/src/ZeroConfigPluginInterface.php index e057c0b9c..3ee679264 100644 --- a/src/ZeroConfigPluginInterface.php +++ b/src/ZeroConfigPluginInterface.php @@ -5,7 +5,11 @@ use PHPCensor\Model\Build; /** + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ interface ZeroConfigPluginInterface { diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index 62783abf2..806a6583f 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -2,6 +2,7 @@ namespace Tests\PHPCensor\Plugin; +use PHPCensor\Store\BuildStore; use PHPUnit\Framework\TestCase; /** @@ -68,9 +69,15 @@ protected function getPluginBuilder($options = []) ->setConstructorArgs([$mockDatabaseManager]) ->getMock(); + $buildStore = $this + ->getMockBuilder(BuildStore::class) + ->setConstructorArgs([$mockDatabaseManager, $storeRegistry]) + ->getMock(); + $storeRegistry ->method('get') - ->willReturn(null); + ->with('Build') + ->willReturn($buildStore); $mockBuild = $this ->getMockBuilder('\PHPCensor\Model\Build') diff --git a/tests/src/Security/Authentication/ServiceTest.php b/tests/src/Security/Authentication/ServiceTest.php index 6998472d5..bc641dc14 100644 --- a/tests/src/Security/Authentication/ServiceTest.php +++ b/tests/src/Security/Authentication/ServiceTest.php @@ -75,7 +75,7 @@ public function testGetLoginPasswordProviders() class DummyProvider extends AbstractProvider { - public function checkRequirements() + public function checkRequirements(): void { } From c1bf86f8ae3d544b241b6125372ceeb1611d75ad Mon Sep 17 00:00:00 2001 From: Paul Staring Date: Thu, 15 Jul 2021 13:58:44 +0200 Subject: [PATCH 017/212] Added text on how to check if Beanstalkd is running, and how to start it --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 961b7e3ce..a217750ab 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,10 @@ Or download [latest archive](https://github.com/php-censor/php-censor/releases/l ```bash # For Debian-based aptitude install beanstalkd +# Check if the service is running: +/etc/init.d/beanstalkd status +# If it's not running, start it: +/etc/init.d/beanstalkd start ``` * Install PHP Censor itself: From 7a6caf4572dfa6702d298fc09993f2209fd875e8 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:12:39 +0700 Subject: [PATCH 018/212] Fixed namespaces and types (Controllers + std functions). --- README.md | 4 +- src/Application.php | 6 +- src/Builder.php | 2 +- src/Command/CreateBuildCommand.php | 2 +- src/Command/InstallCommand.php | 2 +- src/Controller/BuildController.php | 96 +++++--- src/Controller/BuildStatusController.php | 61 ++--- src/Controller/GroupController.php | 36 ++- src/Controller/HomeController.php | 4 +- src/Controller/ProjectController.php | 43 ++-- src/Controller/SessionController.php | 54 +++-- src/Controller/UserController.php | 68 ++++-- src/Controller/WebhookController.php | 213 +++++++++--------- .../WidgetAllProjectsController.php | 10 +- .../WidgetBuildErrorsController.php | 10 +- src/Controller/WidgetLastBuildsController.php | 6 +- .../DataTransformerInterface.php | 12 +- src/Form/DataTransformer/Yaml.php | 12 +- src/Form/Element.php | 10 +- src/Form/Element/Csrf.php | 2 +- src/Form/FieldSet.php | 2 +- src/Form/Input.php | 8 +- src/Helper/BuildInterpolator.php | 44 ++-- src/Helper/CommandExecutor.php | 82 +++---- src/Helper/Diff.php | 12 +- src/Helper/Email.php | 16 +- src/Helper/Github.php | 8 +- src/Helper/Lang.php | 18 +- src/Helper/MailerFactory.php | 2 +- src/Helper/Xml.php | 22 +- src/Helper/Xml/Utf8CleanFilter.php | 6 +- src/Http/Request.php | 26 +-- src/Http/Response.php | 2 +- src/Http/Response/JsonResponse.php | 4 +- src/Http/Router.php | 26 +-- src/Logging/Handler.php | 2 +- src/Model/Base/Build.php | 20 +- src/Model/Base/Environment.php | 8 +- src/Model/Base/Project.php | 10 +- src/Model/Base/User.php | 6 +- src/Model/Build.php | 52 ++--- src/Model/Build/BitbucketBuild.php | 20 +- src/Model/Build/BitbucketHgBuild.php | 2 +- src/Model/Build/BitbucketServerBuild.php | 11 +- src/Model/Build/GitBuild.php | 16 +- src/Model/Build/GithubBuild.php | 16 +- src/Model/Build/GitlabBuild.php | 4 +- src/Model/Build/GogsBuild.php | 4 +- src/Model/Build/HgBuild.php | 4 +- src/Model/Build/LocalBuild.php | 14 +- src/Model/Build/SvnBuild.php | 14 +- src/Model/BuildError.php | 2 +- src/Model/Project.php | 14 +- src/Plugin.php | 60 ++--- src/Plugin/Behat.php | 16 +- src/Plugin/BitbucketNotify.php | 36 +-- src/Plugin/CleanBuild.php | 2 +- src/Plugin/Codeception.php | 24 +- src/Plugin/Composer.php | 12 +- src/Plugin/CopyBuild.php | 12 +- src/Plugin/DeployerOrg.php | 4 +- src/Plugin/EmailNotify.php | 26 +-- src/Plugin/Env.php | 6 +- src/Plugin/FlowdockNotify.php | 4 +- src/Plugin/Git.php | 20 +- src/Plugin/HipchatNotify.php | 2 +- src/Plugin/IrcNotify.php | 14 +- src/Plugin/Lint.php | 10 +- src/Plugin/Mage.php | 20 +- src/Plugin/Mage3.php | 20 +- src/Plugin/Mysql.php | 18 +- src/Plugin/Option/PhpUnitOptions.php | 20 +- src/Plugin/PackageBuild.php | 4 +- src/Plugin/Pahout.php | 16 +- src/Plugin/Pdepend.php | 14 +- src/Plugin/Pgsql.php | 6 +- src/Plugin/Phan.php | 14 +- src/Plugin/Phar.php | 2 +- src/Plugin/Phing.php | 10 +- src/Plugin/Phlint.php | 24 +- src/Plugin/PhpCodeSniffer.php | 26 +-- src/Plugin/PhpCpd.php | 2 +- src/Plugin/PhpCsFixer.php | 14 +- src/Plugin/PhpDocblockChecker.php | 18 +- src/Plugin/PhpLoc.php | 10 +- src/Plugin/PhpMessDetector.php | 22 +- src/Plugin/PhpParallelLint.php | 12 +- src/Plugin/PhpStan.php | 26 +-- src/Plugin/PhpTalLint.php | 24 +- src/Plugin/PhpUnit.php | 30 +-- src/Plugin/Psalm.php | 20 +- src/Plugin/SecurityChecker.php | 2 +- src/Plugin/SensiolabsInsight.php | 10 +- src/Plugin/Shell.php | 4 +- src/Plugin/SlackNotify.php | 4 +- src/Plugin/Sqlite.php | 2 +- src/Plugin/TechnicalDebt.php | 32 +-- src/Plugin/TelegramNotify.php | 18 +- .../Util/BitbucketNotifyPluginResult.php | 6 +- src/Plugin/Util/Executor.php | 40 ++-- src/Plugin/Util/PhpUnitResultJson.php | 18 +- src/Plugin/Util/PhpUnitResultJunit.php | 8 +- .../Util/TestResultParsers/Codeception.php | 4 +- src/Plugin/WebhookNotify.php | 6 +- src/Plugin/Wipe.php | 2 +- src/Plugin/XmppNotify.php | 24 +- src/Security/Authentication/Service.php | 4 +- .../Authentication/UserProvider/Ldap.php | 2 +- src/Service/BuildService.php | 26 +-- src/Service/BuildStatusService.php | 6 +- src/Service/ProjectService.php | 24 +- src/Service/UserService.php | 4 +- src/Store.php | 32 +-- src/Store/BuildErrorStore.php | 12 +- src/Store/BuildErrorWriter.php | 10 +- src/Store/BuildMetaStore.php | 12 +- src/Store/BuildStore.php | 60 ++--- src/Store/EnvironmentStore.php | 10 +- src/Store/ProjectGroupStore.php | 4 +- src/Store/ProjectStore.php | 22 +- src/Store/UserStore.php | 14 +- src/StoreRegistry.php | 4 +- src/View.php | 4 +- src/View/Build/errors.phtml | 10 +- src/View/Build/view.phtml | 4 +- src/View/BuildStatus/view.phtml | 8 +- src/View/Group/index.phtml | 4 +- src/View/Home/index.phtml | 2 +- src/View/Project/ajax-builds.phtml | 10 +- src/View/Project/edit.phtml | 2 +- src/View/Project/view.phtml | 12 +- .../WidgetAllProjects/index-projects.phtml | 12 +- src/View/WidgetAllProjects/update.phtml | 12 +- src/View/WidgetBuildErrors/update.phtml | 10 +- src/View/WidgetLastBuilds/update.phtml | 8 +- src/View/layout.phtml | 12 +- tests/src/ConfigurationTest.php | 2 +- .../src/Form/Validator/YamlValidatorTest.php | 4 +- tests/src/FormTest.php | 58 ++--- tests/src/Plugin/CopyBuildTest.php | 54 ++--- tests/src/Plugin/EmailTest.php | 2 +- tests/src/Plugin/PharTest.php | 34 +-- tests/src/Plugin/Util/ExecutorTest.php | 2 +- tests/src/Plugin/Util/PhpUnitResultTest.php | 4 +- tests/src/PluginTest.php | 10 +- 145 files changed, 1314 insertions(+), 1162 deletions(-) diff --git a/README.md b/README.md index a217750ab..889c8fb93 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ PHP Censor versions: | `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.2` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.2` | `release-2.0` | Current stable version | `>=7.4` | +| `1.3` (Jerry Smith) | `1.3.4` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.4` | `release-2.0` | Current stable version | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) diff --git a/src/Application.php b/src/Application.php index 947fa3518..a70f93fb2 100644 --- a/src/Application.php +++ b/src/Application.php @@ -79,14 +79,14 @@ public function init(): void // Handler for the route we're about to register, checks for a valid session where necessary: $routeHandler = function ($route, Response &$response) use (&$request, $validateSession, $skipAuth) { - $skipValidation = in_array($route['controller'], ['session', 'webhook', 'build-status']); + $skipValidation = \in_array($route['controller'], ['session', 'webhook', 'build-status']); - if (!$skipValidation && !$validateSession() && (!is_callable($skipAuth) || !$skipAuth())) { + if (!$skipValidation && !$validateSession() && (!\is_callable($skipAuth) || !$skipAuth())) { if ($request->isAjax()) { $response->setResponseCode(401); $response->setContent(''); } else { - $_SESSION['php-censor-login-redirect'] = substr($request->getPath(), 1); + $_SESSION['php-censor-login-redirect'] = \substr($request->getPath(), 1); $response = new RedirectResponse($response); $response->setHeader('Location', APP_URL . 'session/login'); } diff --git a/src/Builder.php b/src/Builder.php index 187dc8aea..0149e6539 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -282,7 +282,7 @@ protected function setErrorTrend(): void if (isset($trend[1])) { $previousBuild = $this->store->getById($trend[1]['build_id']); if ($previousBuild && - !in_array( + !\in_array( $previousBuild->getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index f710baa73..584fd19e6 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -99,7 +99,7 @@ public function execute(InputInterface $input, OutputInterface $output) $output->writeln('Build Created'); } catch (\Throwable $e) { $output->writeln('Failed'); - $output->writeln(sprintf('%s', $e->getMessage())); + $output->writeln(\sprintf('%s', $e->getMessage())); } } } diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index f27def844..3ee71116a 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -560,7 +560,7 @@ private function writeConfigFile(array $config): void $dumper = new Dumper(); $yaml = $dumper->dump($config, 4); - file_put_contents($this->configPath, $yaml); + \file_put_contents($this->configPath, $yaml); } private function setupDatabase(OutputInterface $output): bool diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 945d041e5..88e78eb48 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -1,11 +1,14 @@ getParam('page', 1); $plugin = $this->getParam('plugin', ''); @@ -167,9 +172,10 @@ public function view($buildId) /** * Returns an array of the JS plugins to include. + * * @return array */ - protected function getUiPlugins() + protected function getUiPlugins(): array { $rtn = []; $path = PUBLIC_DIR . 'assets/js/build-plugins/'; @@ -189,30 +195,40 @@ protected function getUiPlugins() /** * Get build data from database and json encode it. * - * @param Build $build - * @param string $plugin + * @param Build $build + * @param string $plugin * @param int $severity - * @param string $isNew + * @param string $isNew * @param int $start * @param int $perPage * * @return array + * + * @throws \PHPCensor\Common\Exception\InvalidArgumentException + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException */ - protected function getBuildData(Build $build, $plugin, $severity, $isNew, $start = 0, $perPage = 10) - { + protected function getBuildData( + Build $build, + string $plugin, + int $severity, + string $isNew, + int $start = 0, + int $perPage = 10 + ): array { $data = []; $data['status'] = (int)$build->getStatus(); $data['log'] = $this->cleanLog($build->getLog()); - $data['create_date'] = !is_null($build->getCreateDate()) + $data['create_date'] = !\is_null($build->getCreateDate()) ? $build->getCreateDate()->format('Y-m-d H:i:s') : null; - $data['start_date'] = !is_null($build->getStartDate()) + $data['start_date'] = !\is_null($build->getStartDate()) ? $build->getStartDate()->format('Y-m-d H:i:s') : null; - $data['finish_date'] = !is_null($build->getFinishDate()) + $data['finish_date'] = !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : null; @@ -244,8 +260,15 @@ protected function getBuildData(Build $build, $plugin, $severity, $isNew, $start * * @return string */ - protected function getPaginatorHtml($buildId, $plugin, $severity, $isNew, $total, $perPage, $page) - { + protected function getPaginatorHtml( + int $buildId, + string $plugin, + int $severity, + string $isNew, + int $total, + int $perPage, + int $page + ): string { $view = new View('pagination'); $urlPattern = APP_URL . 'build/view/' . $buildId; @@ -262,10 +285,10 @@ protected function getPaginatorHtml($buildId, $plugin, $severity, $isNew, $total $params['is_new'] = $isNew; } - $urlPattern = $urlPattern . '?' . str_replace( + $urlPattern = $urlPattern . '?' . \str_replace( '%28%3Anum%29', '(:num)', - http_build_query(array_merge($params, ['page' => '(:num)'])) + \http_build_query(\array_merge($params, ['page' => '(:num)'])) ) . '#errors'; $paginator = new Paginator($total, $perPage, $page, $urlPattern); @@ -277,12 +300,15 @@ protected function getPaginatorHtml($buildId, $plugin, $severity, $isNew, $total /** * Create a build using an existing build as a template: * - * @param $buildId + * @param int $buildId + * + * @return Response * - * @return RedirectResponse * @throws NotFoundException + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException */ - public function rebuild($buildId) + public function rebuild(int $buildId): Response { $copy = BuildFactory::getBuildById( $this->configuration, @@ -317,9 +343,17 @@ public function rebuild($buildId) } /** - * Delete a build. - */ - public function delete($buildId) + * Delete a build. + * + * @param int $buildId + * + * @return Response + * + * @throws NotFoundException + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException + */ + public function delete(int $buildId): Response { $this->requireAdmin(); @@ -342,9 +376,13 @@ public function delete($buildId) } /** - * Parse log for unix colours and replace with HTML. - */ - protected function cleanLog($log) + * Parse log for unix colours and replace with HTML. + * + * @param string $log + * + * @return string + */ + protected function cleanLog(string $log): string { $converter = new AnsiToHtmlConverter(null, false); @@ -354,11 +392,11 @@ protected function cleanLog($log) /** * Formats a list of builds into rows suitable for the dropdowns in the header bar. * - * @param $builds + * @param array $builds * * @return array */ - protected function formatBuilds($builds) + protected function formatBuilds(array $builds): array { $rtn = ['count' => $builds['count'], 'items' => []]; @@ -370,11 +408,11 @@ protected function formatBuilds($builds) $rtn['items'][$build->getId()]['header_row'] = $header->render(); } - ksort($rtn['items']); + \ksort($rtn['items']); return $rtn; } - public function ajaxData($buildId) + public function ajaxData(int $buildId): Response { $page = (int)$this->getParam('page', 1); $perPage = (int)$this->getParam('per_page', 10); @@ -426,7 +464,7 @@ public function ajaxData($buildId) return $response; } - public function ajaxMeta($buildId) + public function ajaxMeta(int $buildId): Response { $build = BuildFactory::getBuildById( $this->configuration, @@ -448,7 +486,7 @@ public function ajaxMeta($buildId) return $response; } - public function ajaxQueue() + public function ajaxQueue(): Response { $rtn = [ 'pending' => $this->formatBuilds($this->buildStore->getByStatus(Build::STATUS_PENDING)), diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 376c7f3df..b82b7d3d3 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -1,5 +1,7 @@ $projectId, @@ -151,11 +153,13 @@ public function init(): void /** * Returns the appropriate build PHPUnit coverage image in SVG format for a given project. * - * @param $projectId + * @param int $projectId * * @return Response + * + * @throws HttpException */ - public function phpunitCoverageImage($projectId) + public function phpunitCoverageImage(int $projectId): Response { $project = $this->projectStore->getById($projectId); @@ -173,7 +177,7 @@ public function phpunitCoverageImage($projectId) ]; $coverage = $this->getPhpunitCoverage($project, $branch, $type); - $imageUrl = sprintf( + $imageUrl = \sprintf( 'http://img.shields.io/badge/%s-%s-%s.svg?style=%s', $label, $coverage. '%25', @@ -188,13 +192,13 @@ public function phpunitCoverageImage($projectId) } $cacheDir = RUNTIME_DIR . 'status_cache/'; - $cacheFile = $cacheDir . md5($imageUrl) . '.svg'; - if (!is_file($cacheFile)) { - $image = file_get_contents($imageUrl); - file_put_contents($cacheFile, $image); + $cacheFile = $cacheDir . \md5($imageUrl) . '.svg'; + if (!\is_file($cacheFile)) { + $image = \file_get_contents($imageUrl); + \file_put_contents($cacheFile, $image); } - $image = file_get_contents($cacheFile); + $image = \file_get_contents($cacheFile); $response = new Response(); @@ -207,11 +211,13 @@ public function phpunitCoverageImage($projectId) /** * Returns the appropriate build status image in SVG format for a given project. * - * @param $projectId + * @param int $projectId * * @return Response + * + * @throws HttpException */ - public function image($projectId) + public function image(int $projectId): Response { $project = $this->projectStore->getById($projectId); @@ -229,7 +235,7 @@ public function image($projectId) $status = $this->getStatus($project, $branch); - if (is_null($status)) { + if (\is_null($status)) { $response = new RedirectResponse(); $response->setHeader('Location', '/'); @@ -237,7 +243,7 @@ public function image($projectId) } $color = ($status == 'passing') ? 'green' : 'red'; - $imageUrl = sprintf( + $imageUrl = \sprintf( 'http://img.shields.io/badge/%s-%s-%s.svg?style=%s', $label, $status, @@ -252,13 +258,13 @@ public function image($projectId) } $cacheDir = RUNTIME_DIR . 'status_cache/'; - $cacheFile = $cacheDir . md5($imageUrl) . '.svg'; - if (!is_file($cacheFile)) { - $image = file_get_contents($imageUrl); - file_put_contents($cacheFile, $image); + $cacheFile = $cacheDir . \md5($imageUrl) . '.svg'; + if (!\is_file($cacheFile)) { + $image = \file_get_contents($imageUrl); + \file_put_contents($cacheFile, $image); } - $image = file_get_contents($cacheFile); + $image = \file_get_contents($cacheFile); $response = new Response(); @@ -278,8 +284,9 @@ public function image($projectId) * @throws HttpException * @throws InvalidArgumentException * @throws NotFoundException + * @throws \PHPCensor\Common\Exception\RuntimeException */ - public function view($projectId) + public function view(int $projectId): string { $project = $this->projectStore->getById($projectId); $branch = $this->getParam('branch', $project->getDefaultBranch()); @@ -290,7 +297,7 @@ public function view($projectId) $builds = $this->getLatestBuilds($projectId, $branch); - if (count($builds)) { + if (\count($builds)) { $this->view->latest = $builds[0]; } @@ -304,13 +311,13 @@ public function view($projectId) /** * Displays projects information in ccmenu format * - * @param $projectId + * @param int $projectId * * @return Response * * @throws Exception */ - public function ccxml($projectId) + public function ccxml(int $projectId): Response { /* @var Project $project */ $project = $this->projectStore->getById($projectId); diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php index 21468b100..134ba9383 100644 --- a/src/Controller/GroupController.php +++ b/src/Controller/GroupController.php @@ -1,10 +1,13 @@ requireAdmin(); @@ -49,7 +52,7 @@ public function index() $projectsActive = $this->storeRegistry->get('Project')->getByGroupId($group->getId(), false); $projectsArchived = $this->storeRegistry->get('Project')->getByGroupId($group->getId(), true); - $thisGroup['projects'] = array_merge($projectsActive['items'], $projectsArchived['items']); + $thisGroup['projects'] = \array_merge($projectsActive['items'], $projectsArchived['items']); $groups[] = $thisGroup; } @@ -61,15 +64,19 @@ public function index() /** * Add or edit a project group. * - * @param null $groupId + * @param int|null $groupId + * + * @return Response * - * @return RedirectResponse + * @throws \PHPCensor\Common\Exception\InvalidArgumentException + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException */ - public function edit($groupId = null) + public function edit(?int $groupId = null) { $this->requireAdmin(); - if (!is_null($groupId)) { + if (!\is_null($groupId)) { $group = $this->groupStore->getById($groupId); } else { $group = new ProjectGroup($this->storeRegistry); @@ -77,7 +84,7 @@ public function edit($groupId = null) if ($this->request->getMethod() == 'POST') { $group->setTitle($this->getParam('title')); - if (is_null($groupId)) { + if (\is_null($groupId)) { /** @var User $user */ $user = $this->getUser(); @@ -96,7 +103,7 @@ public function edit($groupId = null) $form = new Form(); $form->setMethod('POST'); - $form->setAction(APP_URL . 'group/edit' . (!is_null($groupId) ? '/' . $groupId : '')); + $form->setAction(APP_URL . 'group/edit' . (!\is_null($groupId) ? '/' . $groupId : '')); $form->addField(new Form\Element\Csrf('group_form')); @@ -118,10 +125,16 @@ public function edit($groupId = null) /** * Delete a project group. - * @param $groupId - * @return RedirectResponse + * + * @param int $groupId + * + * @return Response + * + * @throws \PHPCensor\Common\Exception\Exception + * @throws \PHPCensor\Common\Exception\InvalidArgumentException + * @throws \PHPCensor\Exception\HttpException */ - public function delete($groupId) + public function delete(int $groupId): Response { $this->requireAdmin(); $group = $this->groupStore->getById($groupId); @@ -129,6 +142,7 @@ public function delete($groupId) $this->groupStore->delete($group); $response = new RedirectResponse(); $response->setHeader('Location', APP_URL.'group'); + return $response; } } diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index b56a82cbe..50bdf37ca 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -1,5 +1,7 @@ layout->title = Lang::get('dashboard'); diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 328561e5a..8560a1426 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -1,5 +1,7 @@ getParam('branch', ''); $environment = $this->getParam('environment', ''); @@ -78,7 +81,7 @@ public function ajaxBuilds($projectId) $perPage ); - $response = new PHPCensor\Http\Response(); + $response = new Response(); $response->setContent($builds[0]); return $response; @@ -89,11 +92,13 @@ public function ajaxBuilds($projectId) * * @param int $projectId * - * @throws NotFoundException - * * @return string + * + * @throws NotFoundException + * @throws PHPCensor\Exception\HttpException + * @throws RuntimeException */ - public function view($projectId) + public function view(int $projectId): string { $branch = $this->getParam('branch', ''); $environment = $this->getParam('environment', ''); @@ -157,8 +162,14 @@ public function view($projectId) * * @return string */ - protected function getPaginatorHtml($projectId, $branch, $environment, $total, $perPage, $page) - { + protected function getPaginatorHtml( + int $projectId, + string $branch, + string $environment, + int $total, + int $perPage, + int $page + ): string { $view = new View('pagination'); $urlPattern = APP_URL . 'project/view/' . $projectId; @@ -171,10 +182,10 @@ protected function getPaginatorHtml($projectId, $branch, $environment, $total, $ $params['environment'] = $environment; } - $urlPattern = $urlPattern . '?' . str_replace( + $urlPattern = $urlPattern . '?' . \str_replace( '%28%3Anum%29', '(:num)', - http_build_query(array_merge($params, ['page' => '(:num)'])) + \http_build_query(\array_merge($params, ['page' => '(:num)'])) ); $paginator = new Paginator($total, $perPage, $page, $urlPattern); @@ -446,7 +457,7 @@ public function edit($projectId) $values = $project->getDataArray(); $values['environments'] = $project->getEnvironments(); - if (in_array($values['type'], [ + if (\in_array($values['type'], [ Project::TYPE_GITHUB, Project::TYPE_GITLAB ], true)) { @@ -455,10 +466,10 @@ public function edit($projectId) $values['reference'] = $accessInfo['origin']; } elseif (isset($accessInfo['domain']) && $accessInfo['domain']) { $reference = $accessInfo['user'] . - '@' . $accessInfo['domain'] . ':' . ltrim($project->getReference(), '/') . '.git'; + '@' . $accessInfo['domain'] . ':' . \ltrim($project->getReference(), '/') . '.git'; if (isset($accessInfo['port']) && $accessInfo['port']) { $reference = $accessInfo['user'] . '@' . $accessInfo['domain'] . ':' . $accessInfo['port'] . '/' . - ltrim($project->getReference(), '/') . '.git'; + \ltrim($project->getReference(), '/') . '.git'; } $values['reference'] = $reference; @@ -538,7 +549,7 @@ protected function projectForm($values, $type = 'add') Project::TYPE_SVN => 'Svn (Subversion)', ]; - $sourcesPattern = sprintf('^(%s)', implode('|', Project::$allowedTypes)); + $sourcesPattern = \sprintf('^(%s)', \implode('|', Project::$allowedTypes)); $field = Form\Element\Select::create('type', Lang::get('where_hosted'), true); $field->setPattern($sourcesPattern); @@ -685,9 +696,9 @@ protected function getReferenceValidator($values) ], ]; - if (in_array($type, $validators) && !preg_match($validators[$type]['regex'], $val)) { + if (\in_array($type, $validators) && !\preg_match($validators[$type]['regex'], $val)) { throw new RuntimeException($validators[$type]['message']); - } elseif (Project::TYPE_LOCAL === $type && !is_dir($val)) { + } elseif (Project::TYPE_LOCAL === $type && !\is_dir($val)) { throw new RuntimeException(Lang::get('error_path')); } diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index af84fe22d..efbf21bce 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -1,5 +1,7 @@ authentication = new Service($this->configuration, $this->storeRegistry); } - protected function loginForm($values) + protected function loginForm(array $values): Form { $form = new Form(); $form->setMethod('POST'); @@ -82,6 +85,11 @@ protected function loginForm($values) /** * Handles user login (form and processing) + * + * @return string|Response + * + * @throws HttpException + * @throws \PHPCensor\Common\Exception\InvalidArgumentException */ public function login() { @@ -141,15 +149,15 @@ public function login() $_SESSION['php-censor-user-id'] = $user->getId(); if ($rememberMe) { - $rememberKey = md5(microtime(true)); + $rememberKey = \md5(\microtime(true)); $user->setRememberKey($rememberKey); $this->userStore->save($user); - setcookie( + \setcookie( 'remember_key', $rememberKey, - (time() + 60 * 60 * 24 * 30), + (\time() + 60 * 60 * 24 * 30), null, null, null, @@ -172,18 +180,18 @@ public function login() } /** - * Handles user logout. - */ - public function logout() + * Handles user logout. + */ + public function logout(): Response { unset($_SESSION['php-censor-user-id']); - session_destroy(); + \session_destroy(); - setcookie( + \setcookie( 'remember_key', null, - (time() - 1), + (\time() - 1), null, null, null, @@ -192,6 +200,7 @@ public function logout() $response = new RedirectResponse(); $response->setHeader('Location', APP_URL); + return $response; } @@ -202,7 +211,7 @@ public function logout() * * @throws HttpException */ - public function forgotPassword() + public function forgotPassword(): string { if ($this->request->getMethod() == 'POST') { $email = $this->getParam('email', null); @@ -213,7 +222,7 @@ public function forgotPassword() return $this->view->render(); } - $key = md5(date('Y-m-d') . $user->getHash()); + $key = \md5(\date('Y-m-d') . $user->getHash()); $message = Lang::get('reset_email_body', $user->getName(), APP_URL, $user->getId(), $key); $email = new Email($this->configuration); @@ -230,14 +239,19 @@ public function forgotPassword() /** * Allows the user to change their password after a password reset email. - * @param $userId - * @param $key - * @return string + * + * @param int $userId + * @param string $key + * + * @return string|Response + * + * @throws HttpException + * @throws \PHPCensor\Common\Exception\InvalidArgumentException */ - public function resetPassword($userId, $key) + public function resetPassword(int $userId, string $key) { $user = $this->userStore->getById($userId); - $userKey = md5(date('Y-m-d') . $user->getHash()); + $userKey = \md5(\date('Y-m-d') . $user->getHash()); if (empty($user) || $key != $userKey) { $this->view->error = Lang::get('reset_invalid'); @@ -245,7 +259,7 @@ public function resetPassword($userId, $key) } if ($this->request->getMethod() == 'POST') { - $hash = password_hash($this->getParam('password'), PASSWORD_DEFAULT); + $hash = \password_hash($this->getParam('password'), PASSWORD_DEFAULT); $user->setHash($hash); $this->userStore->save($user); @@ -254,6 +268,7 @@ public function resetPassword($userId, $key) $response = new RedirectResponse(); $response->setHeader('Location', APP_URL); + return $response; } @@ -265,9 +280,10 @@ public function resetPassword($userId, $key) /** * Get the URL the user was trying to go to prior to being asked to log in. + * * @return string */ - protected function getLoginRedirect() + protected function getLoginRedirect(): string { $rtn = APP_URL; diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 793a620b7..5c82b9516 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -1,11 +1,14 @@ userStore->getWhere([], 1000, 0, ['email' => 'ASC']); $this->view->currentUser = $this->getUser(); @@ -55,9 +58,13 @@ public function index() /** * Allows the user to edit their profile. + * * @return string + * + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException */ - public function profile() + public function profile(): string { /** @var User $user */ $user = $this->getUser(); @@ -122,7 +129,7 @@ public function profile() $language->setLabel(Lang::get('language')); $language->setRequired(true); $language->setOptions( - array_merge( + \array_merge( [null => Lang::get('default') . ' (' . $this->configuration->get('php-censor.language') . ')'], Lang::getLanguageOptions() ) @@ -156,8 +163,12 @@ public function profile() } /** - * Add a user - handles both form and processing. - */ + * Add a user - handles both form and processing. + * + * @return string|Response + * + * @throws \PHPCensor\Exception\HttpException + */ public function add() { $this->requireAdmin(); @@ -200,13 +211,23 @@ public function add() $response = new RedirectResponse(); $response->setHeader('Location', APP_URL . 'user'); + return $response; } /** - * Edit a user - handles both form and processing. - */ - public function edit($userId) + * Edit a user - handles both form and processing. + * + * @param int $userId + * + * @return string|Response + * + * @throws ForbiddenException + * @throws NotFoundException + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException + */ + public function edit(int $userId) { $currentUser = $this->getUser(); @@ -224,7 +245,7 @@ public function edit($userId) $this->layout->title = $user->getName(); $this->layout->subtitle = Lang::get('edit_user'); - $values = array_merge($user->getDataArray(), $this->getParams()); + $values = \array_merge($user->getDataArray(), $this->getParams()); $form = $this->userForm($values, 'edit/' . $userId); if ($method != 'POST' || ($method == 'POST' && !$form->validate())) { @@ -250,13 +271,22 @@ public function edit($userId) $response = new RedirectResponse(); $response->setHeader('Location', APP_URL . 'user'); + return $response; } /** - * Create user add / edit form. - */ - protected function userForm($values, $type = 'add') + * Create user add / edit form. + * + * @param array $values + * @param string $type + * + * @return Form + * + * @throws \PHPCensor\Common\Exception\RuntimeException + * @throws \PHPCensor\Exception\HttpException + */ + protected function userForm(array $values, string $type = 'add'): Form { $currentUser = $this->getUser(); @@ -315,9 +345,16 @@ protected function userForm($values, $type = 'add') } /** - * Delete a user. - */ - public function delete($userId) + * Delete a user. + * + * @param int $userId + * + * @return Response + * + * @throws NotFoundException + * @throws \PHPCensor\Exception\HttpException + */ + public function delete(int $userId): Response { $this->requireAdmin(); @@ -331,6 +368,7 @@ public function delete($userId) $response = new RedirectResponse(); $response->setHeader('Location', APP_URL . 'user'); + return $response; } } diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index 1220ef7b3..a7043ba81 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -1,5 +1,7 @@ getArchived()) { throw new NotFoundException(Lang::get('project_x_not_found', $project->getId())); } @@ -141,8 +146,8 @@ protected function createBuild( $environmentObject = $environmentStore->getByNameAndProjectId($environment, $project->getId()); if ($environment && $environmentObject) { if ( - !in_array($environmentObject->getId(), $ignoreEnvironments) || - ($tag && !in_array($tag, $ignoreTags, true)) + !\in_array($environmentObject->getId(), $ignoreEnvironments) || + ($tag && !\in_array($tag, $ignoreTags, true)) ) { // If not, create a new build job for it: $build = $this->buildService->createBuild( @@ -173,18 +178,18 @@ protected function createBuild( return [ 'status' => 'ok', 'builds' => $createdBuilds, - 'message' => sprintf( + 'message' => \sprintf( 'For this commit some builds already exists (%s)', - implode(', ', $duplicates) + \implode(', ', $duplicates) ) ]; } } else { return [ 'status' => 'ignored', - 'message' => sprintf( + 'message' => \sprintf( 'For this commit already created builds (%s)', - implode(', ', $duplicates) + \implode(', ', $duplicates) ) ]; } @@ -195,8 +200,8 @@ protected function createBuild( $duplicates = []; foreach ($environmentIds as $environmentId) { if ( - !in_array($environmentId, $ignoreEnvironments) || - ($tag && !in_array($tag, $ignoreTags, true)) + !\in_array($environmentId, $ignoreEnvironments) || + ($tag && !\in_array($tag, $ignoreTags, true)) ) { // If not, create a new build job for it: $build = $this->buildService->createBuild( @@ -228,18 +233,18 @@ protected function createBuild( return [ 'status' => 'ok', 'builds' => $createdBuilds, - 'message' => sprintf( + 'message' => \sprintf( 'For this commit some builds already exists (%s)', - implode(', ', $duplicates) + \implode(', ', $duplicates) ) ]; } } else { return [ 'status' => 'ignored', - 'message' => sprintf( + 'message' => \sprintf( 'For this commit already created builds (%s)', - implode(', ', $duplicates) + \implode(', ', $duplicates) ) ]; } @@ -249,8 +254,8 @@ protected function createBuild( } } else { $environmentId = null; - if (!in_array($environmentId, $ignoreEnvironments, true) || - ($tag && !in_array($tag, $ignoreTags, true))) { + if (!\in_array($environmentId, $ignoreEnvironments, true) || + ($tag && !\in_array($tag, $ignoreTags, true))) { $build = $this->buildService->createBuild( $project, null, @@ -268,9 +273,9 @@ protected function createBuild( } else { return [ 'status' => 'ignored', - 'message' => sprintf( + 'message' => \sprintf( 'Duplicate of build #%d', - array_search($environmentId, $ignoreEnvironments) + \array_search($environmentId, $ignoreEnvironments) ), ]; } @@ -287,13 +292,13 @@ protected function createBuild( * * @throws Exception If the project does not exist or is not of the expected type. */ - protected function fetchProject($projectId, array $expectedType) + protected function fetchProject(int $projectId, array $expectedType): Project { if (empty($projectId)) { throw new NotFoundException('Project does not exist: ' . $projectId); } - if (is_numeric($projectId)) { + if (\is_numeric($projectId)) { $project = $this->projectStore->getById((int)$projectId); } else { $projects = $this->projectStore->getByTitle($projectId, 2); @@ -303,10 +308,10 @@ protected function fetchProject($projectId, array $expectedType) if ($projects['count'] > 1) { throw new NotFoundException('Project id is ambiguous: ' . $projectId); } - $project = reset($projects['items']); + $project = \reset($projects['items']); } - if (!in_array($project->getType(), $expectedType, true)) { + if (!\in_array($project->getType(), $expectedType, true)) { throw new NotFoundException('Wrong project type: ' . $project->getType()); } @@ -322,7 +327,7 @@ protected function fetchProject($projectId, array $expectedType) * * @throws Exception */ - public function git($projectId) + public function git(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_LOCAL, @@ -356,7 +361,7 @@ public function git($projectId) * * @throws Exception */ - public function hg($projectId) + public function hg(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_LOCAL, @@ -389,9 +394,9 @@ public function hg($projectId) * * @throws Exception */ - public function svn($projectId) + public function svn(int $projectId): array { - $project = $this->fetchProject($projectId, [ + $project = $this->fetchProject($projectId, [ Project::TYPE_SVN ]); $branch = $this->getParam('branch', $project->getDefaultBranch()); @@ -419,7 +424,7 @@ public function svn($projectId) * * @throws Exception */ - public function bitbucket($projectId) + public function bitbucket(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_BITBUCKET, @@ -431,10 +436,10 @@ public function bitbucket($projectId) // Support both old services and new webhooks if ($payload = $this->getParam('payload')) { - return $this->bitbucketService(json_decode($payload, true), $project); + return $this->bitbucketService(\json_decode($payload, true), $project); } - $payload = json_decode(file_get_contents("php://input"), true); + $payload = \json_decode(\file_get_contents("php://input"), true); // Handle Pull Request webhooks: if (!empty($payload['pullrequest'])) { @@ -466,7 +471,7 @@ public function bitbucket($projectId) * * @return array */ - protected function bitbucketCommitRequest(Project $project, array $payload) + protected function bitbucketCommitRequest(Project $project, array $payload): array { $results = []; $status = 'failed'; @@ -474,10 +479,10 @@ protected function bitbucketCommitRequest(Project $project, array $payload) if (!empty($commit['new'])) { try { $email = $commit['new']['target']['author']['raw']; - if (strpos($email, '>') !== false) { + if (\strpos($email, '>') !== false) { // In order not to loose email if it is RAW, w/o "<>" symbols - $email = substr($email, 0, strpos($email, '>')); - $email = substr($email, strpos($email, '<') + 1); + $email = \substr($email, 0, \strpos($email, '>')); + $email = \substr($email, \strpos($email, '<') + 1); } $results[$commit['new']['target']['hash']] = $this->createBuild( @@ -509,11 +514,11 @@ protected function bitbucketCommitRequest(Project $project, array $payload) * * @throws Exception */ - protected function bitbucketPullRequest(Project $project, array $payload) + protected function bitbucketPullRequest(Project $project, array $payload): array { - $triggerType = trim($_SERVER['HTTP_X_EVENT_KEY']); + $triggerType = \trim($_SERVER['HTTP_X_EVENT_KEY']); - if (!array_key_exists( + if (!\array_key_exists( $triggerType, BitbucketBuild::$pullrequestTriggersToSources )) { @@ -545,11 +550,11 @@ protected function bitbucketPullRequest(Project $project, array $payload) $results = []; $status = 'failed'; - $commits = json_decode($commitsResponse->getBody(), true)['values']; + $commits = \json_decode((string)$commitsResponse->getBody(), true)['values']; foreach ($commits as $commit) { // Skip all but the current HEAD commit ID: $id = $commit['hash']; - if (strpos($id, $payload['pullrequest']['source']['commit']['hash']) !== 0) { + if (\strpos($id, $payload['pullrequest']['source']['commit']['hash']) !== 0) { $results[$id] = ['status' => 'ignored', 'message' => 'not branch head']; continue; @@ -558,10 +563,10 @@ protected function bitbucketPullRequest(Project $project, array $payload) try { $branch = $payload['pullrequest']['destination']['branch']['name']; $committer = $commit['author']['raw']; - if (strpos($committer, '>') !== false) { + if (\strpos($committer, '>') !== false) { // In order not to loose email if it is RAW, w/o "<>" symbols - $committer = substr($committer, 0, strpos($committer, '>')); - $committer = substr($committer, strpos($committer, '<') + 1); + $committer = \substr($committer, 0, \strpos($committer, '>')); + $committer = \substr($committer, \strpos($committer, '<') + 1); } $message = $commit['message']; @@ -600,11 +605,11 @@ protected function bitbucketPullRequest(Project $project, array $payload) * * @throws Exception */ - protected function bitbucketSvrPullRequest(Project $project, array $payload) + protected function bitbucketSvrPullRequest(Project $project, array $payload): array { - $triggerType = trim($_SERVER['HTTP_X_EVENT_KEY']); + $triggerType = \trim($_SERVER['HTTP_X_EVENT_KEY']); - if (!array_key_exists( + if (!\array_key_exists( $triggerType, BitbucketServerBuild::$pullrequestTriggersToSources )) { @@ -654,15 +659,15 @@ protected function bitbucketSvrPullRequest(Project $project, array $payload) * * @return array */ - protected function bitbucketService(array $payload, Project $project) + protected function bitbucketService(array $payload, Project $project): array { $results = []; $status = 'failed'; foreach ($payload['commits'] as $commit) { try { $email = $commit['raw_author']; - $email = substr($email, 0, strpos($email, '>')); - $email = substr($email, strpos($email, '<') + 1); + $email = \substr($email, 0, \strpos($email, '>')); + $email = \substr($email, \strpos($email, '<') + 1); $results[$commit['raw_node']] = $this->createBuild( Build::SOURCE_WEBHOOK_PUSH, @@ -689,7 +694,7 @@ protected function bitbucketService(array $payload, Project $project) * * @throws Exception */ - public function github($projectId) + public function github(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_GITHUB, @@ -698,10 +703,10 @@ public function github($projectId) switch ($_SERVER['CONTENT_TYPE']) { case 'application/json': - $payload = json_decode(file_get_contents('php://input'), true); + $payload = \json_decode(\file_get_contents('php://input'), true); break; case 'application/x-www-form-urlencoded': - $payload = json_decode($this->getParam('payload'), true); + $payload = \json_decode($this->getParam('payload'), true); break; default: return [ @@ -712,12 +717,12 @@ public function github($projectId) } // Handle Pull Request webhooks: - if (array_key_exists('pull_request', $payload)) { + if (\array_key_exists('pull_request', $payload)) { return $this->githubPullRequest($project, $payload); } // Handle Push (and Tag) webhooks: - if (array_key_exists('head_commit', $payload)) { + if (\array_key_exists('head_commit', $payload)) { return $this->githubCommitRequest($project, $payload); } @@ -732,16 +737,16 @@ public function github($projectId) * * @return array */ - protected function githubCommitRequest(Project $project, array $payload) + protected function githubCommitRequest(Project $project, array $payload): array { // Github sends a payload when you close a pull request with a non-existent commit. We don't want this. - if (array_key_exists('after', $payload) && + if (\array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') { return ['status' => 'ignored']; } if (isset($payload['head_commit']) && $payload['head_commit']) { - $isTag = (substr($payload['ref'], 0, 10) == 'refs/tags/') ? true : false; + $isTag = (\substr($payload['ref'], 0, 10) == 'refs/tags/') ? true : false; $commit = $payload['head_commit']; $results = []; $status = 'failed'; @@ -752,11 +757,11 @@ protected function githubCommitRequest(Project $project, array $payload) try { $tag = null; if ($isTag) { - $tag = str_replace('refs/tags/', '', $payload['ref']); - $branch = str_replace('refs/heads/', '', $payload['base_ref']); + $tag = \str_replace('refs/tags/', '', $payload['ref']); + $branch = \str_replace('refs/heads/', '', $payload['base_ref']); $committer = $payload['pusher']['email']; } else { - $branch = str_replace('refs/heads/', '', $payload['ref']); + $branch = \str_replace('refs/heads/', '', $payload['ref']); $committer = $commit['committer']['email']; } @@ -792,11 +797,11 @@ protected function githubCommitRequest(Project $project, array $payload) * * @throws Exception */ - protected function githubPullRequest(Project $project, array $payload) + protected function githubPullRequest(Project $project, array $payload): array { - $triggerType = trim($payload['action']); + $triggerType = \trim($payload['action']); - if (!array_key_exists( + if (!\array_key_exists( $triggerType, GithubBuild::$pullrequestTriggersToSources )) { @@ -836,7 +841,7 @@ protected function githubPullRequest(Project $project, array $payload) $results = []; $status = 'failed'; - $commits = json_decode($response->getBody(), true); + $commits = \json_decode((string)$response->getBody(), true); foreach ($commits as $commit) { // Skip all but the current HEAD commit ID: $id = $commit['sha']; @@ -847,7 +852,7 @@ protected function githubPullRequest(Project $project, array $payload) } try { - $branch = str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']); + $branch = \str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']); $committer = $commit['commit']['author']['email']; $message = $commit['commit']['message']; @@ -885,15 +890,15 @@ protected function githubPullRequest(Project $project, array $payload) * * @throws Exception */ - public function gitlab($projectId) + public function gitlab(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_GITLAB, Project::TYPE_GIT, ]); - $payloadString = file_get_contents("php://input"); - $payload = json_decode($payloadString, true); + $payloadString = \file_get_contents("php://input"); + $payload = \json_decode($payloadString, true); // build on merge request events if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') { @@ -916,15 +921,15 @@ public function gitlab($projectId) } // build on push events - if (isset($payload['commits']) && is_array($payload['commits'])) { + if (isset($payload['commits']) && \is_array($payload['commits'])) { // If we have a list of commits, then add them all as builds to be tested: $results = []; $status = 'failed'; - $commit = end($payload['commits']); + $commit = \end($payload['commits']); try { - $branch = str_replace('refs/heads/', '', $payload['ref']); + $branch = \str_replace('refs/heads/', '', $payload['ref']); $committer = $commit['author']['email']; $results[$commit['id']] = $this->createBuild( Build::SOURCE_WEBHOOK_PUSH, @@ -953,7 +958,7 @@ public function gitlab($projectId) * * @throws Exception */ - public function gogs($projectId) + public function gogs(int $projectId): array { $project = $this->fetchProject($projectId, [ Project::TYPE_GOGS, @@ -966,19 +971,19 @@ public function gogs($projectId) switch ($contentType) { case 'application/x-www-form-urlencoded': - $payload = json_decode($this->getParam('payload'), true); + $payload = \json_decode($this->getParam('payload'), true); break; case 'application/json': default: - $payload = json_decode(file_get_contents('php://input'), true); + $payload = \json_decode(\file_get_contents('php://input'), true); } // Handle Push web hooks: - if (array_key_exists('commits', $payload)) { + if (\array_key_exists('commits', $payload)) { return $this->gogsCommitRequest($project, $payload); } - if (array_key_exists('pull_request', $payload)) { + if (\array_key_exists('pull_request', $payload)) { return $this->gogsPullRequest($project, $payload); } @@ -993,15 +998,15 @@ public function gogs($projectId) * * @return array */ - protected function gogsCommitRequest(Project $project, array $payload) + protected function gogsCommitRequest(Project $project, array $payload): array { - if (isset($payload['commits']) && is_array($payload['commits'])) { + if (isset($payload['commits']) && \is_array($payload['commits'])) { // If we have a list of commits, then add them all as builds to be tested: $results = []; $status = 'failed'; foreach ($payload['commits'] as $commit) { try { - $branch = str_replace('refs/heads/', '', $payload['ref']); + $branch = \str_replace('refs/heads/', '', $payload['ref']); $committer = $commit['author']['email']; $results[$commit['id']] = $this->createBuild( Build::SOURCE_WEBHOOK_PUSH, @@ -1034,7 +1039,7 @@ protected function gogsCommitRequest(Project $project, array $payload) * * @throws InvalidArgumentException */ - protected function gogsPullRequest(Project $project, array $payload) + protected function gogsPullRequest(Project $project, array $payload): array { $pullRequest = $payload['pull_request']; $headBranch = $pullRequest['head_branch']; @@ -1047,21 +1052,21 @@ protected function gogsPullRequest(Project $project, array $payload) $activeStates = ['open']; $inactiveStates = ['closed']; - if (!in_array($action, $activeActions) && !in_array($action, $inactiveActions)) { + if (!\in_array($action, $activeActions) && !\in_array($action, $inactiveActions)) { return ['status' => 'ignored', 'message' => 'Action ' . $action . ' ignored']; } - if (!in_array($state, $activeStates) && !in_array($state, $inactiveStates)) { + if (!\in_array($state, $activeStates) && !\in_array($state, $inactiveStates)) { return ['status' => 'ignored', 'message' => 'State ' . $state . ' ignored']; } $envs = []; // Get environment form labels - if (in_array($action, $activeActions) && in_array($state, $activeStates)) { - if (isset($pullRequest['labels']) && is_array($pullRequest['labels'])) { + if (\in_array($action, $activeActions) && \in_array($state, $activeStates)) { + if (isset($pullRequest['labels']) && \is_array($pullRequest['labels'])) { foreach ($pullRequest['labels'] as $label) { - if (strpos($label['name'], 'env:') === 0) { - $envs[] = substr($label['name'], 4); + if (\strpos($label['name'], 'env:') === 0) { + $envs[] = \substr($label['name'], 4); } } } @@ -1072,8 +1077,8 @@ protected function gogsPullRequest(Project $project, array $payload) $store = $this->storeRegistry->get('Environment'); foreach ($envObjects['items'] as $environment) { $branches = $environment->getBranches(); - if (in_array($environment->getName(), $envs)) { - if (!in_array($headBranch, $branches)) { + if (\in_array($environment->getName(), $envs)) { + if (!\in_array($headBranch, $branches)) { // Add branch to environment $branches[] = $headBranch; $environment->setBranches($branches); @@ -1081,9 +1086,9 @@ protected function gogsPullRequest(Project $project, array $payload) $envsUpdated[] = $environment->getId(); } } else { - if (in_array($headBranch, $branches)) { + if (\in_array($headBranch, $branches)) { // Remove branch from environment - $branches = array_diff($branches, [$headBranch]); + $branches = \array_diff($branches, [$headBranch]); $environment->setBranches($branches); $store->save($environment); $envsUpdated[] = $environment->getId(); diff --git a/src/Controller/WidgetAllProjectsController.php b/src/Controller/WidgetAllProjectsController.php index 595cb3f34..a79ae493a 100644 --- a/src/Controller/WidgetAllProjectsController.php +++ b/src/Controller/WidgetAllProjectsController.php @@ -1,5 +1,7 @@ view->groups = $this->getGroupInfo(); @@ -63,7 +65,7 @@ public function index() * * @throws Exception */ - protected function getSummaryHtml($projects) + protected function getSummaryHtml(array $projects): string { $summaryBuilds = []; $successes = []; @@ -106,7 +108,7 @@ protected function getSummaryHtml($projects) * * @throws Exception */ - protected function getGroupInfo() + protected function getGroupInfo(): array { $rtn = []; $groups = $this->groupStore->getWhere([], 100, 0, ['title' => 'ASC']); @@ -131,7 +133,7 @@ protected function getGroupInfo() * * @throws HttpException */ - public function update($projectId) + public function update(int $projectId): Response { $count = $this->buildStore->getWhere( ['project_id' => $projectId], diff --git a/src/Controller/WidgetBuildErrorsController.php b/src/Controller/WidgetBuildErrorsController.php index f989d2979..78c2c8741 100644 --- a/src/Controller/WidgetBuildErrorsController.php +++ b/src/Controller/WidgetBuildErrorsController.php @@ -1,5 +1,7 @@ setContent($this->renderAllProjectsLatestBuilds($this->view)); @@ -67,13 +69,13 @@ public function update() * * @throws HttpException */ - protected function renderAllProjectsLatestBuilds($view) + protected function renderAllProjectsLatestBuilds(View $view): string { $builds = $this->buildStore->getAllProjectsLatestBuilds(); if (!empty($builds['projects'])) { $view->builds = $builds['projects']; - $projects = $this->projectStore->getByIds(array_keys($builds['projects'])); + $projects = $this->projectStore->getByIds(\array_keys($builds['projects'])); $viewProjects = []; foreach ($projects as $id => $project) { diff --git a/src/Controller/WidgetLastBuildsController.php b/src/Controller/WidgetLastBuildsController.php index b69c80c64..239ae004e 100644 --- a/src/Controller/WidgetLastBuildsController.php +++ b/src/Controller/WidgetLastBuildsController.php @@ -1,5 +1,7 @@ buildStore->getLatestBuilds(null, 10); @@ -53,7 +55,7 @@ public function index() /** * @return Response */ - public function update() + public function update(): Response { $builds = $this->buildStore->getLatestBuilds(null, 10); diff --git a/src/Form/DataTransformer/DataTransformerInterface.php b/src/Form/DataTransformer/DataTransformerInterface.php index bb54dd0ee..9ffc3979d 100644 --- a/src/Form/DataTransformer/DataTransformerInterface.php +++ b/src/Form/DataTransformer/DataTransformerInterface.php @@ -1,12 +1,20 @@ + */ interface DataTransformerInterface { /** transform when putting the data into a form */ - public function transform($value); + public function transform(string $value): string; /** reversen when getting the data from a form */ - public function reverseTransform($value); + public function reverseTransform(string $value): string; } diff --git a/src/Form/DataTransformer/Yaml.php b/src/Form/DataTransformer/Yaml.php index 74c2b52c7..23267966e 100644 --- a/src/Form/DataTransformer/Yaml.php +++ b/src/Form/DataTransformer/Yaml.php @@ -1,16 +1,24 @@ + */ class Yaml implements DataTransformerInterface { - public function transform($value) + public function transform(string $value): string { /* nothing to do here - only called before displaying values on FE */ return $value; } - public function reverseTransform($value) + public function reverseTransform(string $value): string { return \str_replace("\t", " ", $value); } diff --git a/src/Form/Element.php b/src/Form/Element.php index 038260ad3..8710288f3 100644 --- a/src/Form/Element.php +++ b/src/Form/Element.php @@ -41,7 +41,7 @@ abstract class Element */ public function __construct($name = null) { - if (!is_null($name)) { + if (!\is_null($name)) { $this->setName($name); } } @@ -61,7 +61,7 @@ public function getName() */ public function setName($name) { - $this->name = strtolower(preg_replace('/([^a-zA-Z0-9_\-%])/', '', $name)); + $this->name = \strtolower(\preg_replace('/([^a-zA-Z0-9_\-%])/', '', $name)); return $this; } @@ -167,9 +167,9 @@ public function setParent(Element $parent) */ public function render($viewFile = null) { - if (is_null($viewFile)) { - $class = explode('\\', get_called_class()); - $viewFile = end($class); + if (\is_null($viewFile)) { + $class = \explode('\\', \get_called_class()); + $viewFile = \end($class); } $view = new View('Form/' . $viewFile); diff --git a/src/Form/Element/Csrf.php b/src/Form/Element/Csrf.php index b6754ed72..71bb1287b 100644 --- a/src/Form/Element/Csrf.php +++ b/src/Form/Element/Csrf.php @@ -30,7 +30,7 @@ protected function onPreRender(View &$view) parent::onPreRender($view); $this->setValue( - rtrim(strtr(base64_encode(random_bytes(32)), '+/', '-_'), '=') + \rtrim(\strtr(\base64_encode(\random_bytes(32)), '+/', '-_'), '=') ); $view->value = $this->getValue(); diff --git a/src/Form/FieldSet.php b/src/Form/FieldSet.php index 50ae3e988..996e4128f 100644 --- a/src/Form/FieldSet.php +++ b/src/Form/FieldSet.php @@ -22,7 +22,7 @@ public function getValues() $fieldName = $field->getName(); if (empty($fieldName)) { - $rtn = array_merge($rtn, $field->getValues()); + $rtn = \array_merge($rtn, $field->getValues()); } else { $rtn[$fieldName] = $field->getValues(); } diff --git a/src/Form/Input.php b/src/Form/Input.php index 8a5baff8a..a13bc58ea 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -122,7 +122,7 @@ public function getValidator() */ public function setValidator($validator) { - if (is_callable($validator) || $validator instanceof Closure) { + if (\is_callable($validator) || $validator instanceof Closure) { $this->validator = $validator; } @@ -159,7 +159,7 @@ public function validate() return false; } - if ($this->getPattern() && !preg_match('/' . $this->getPattern() . '/', $this->getValue())) { + if ($this->getPattern() && !\preg_match('/' . $this->getPattern() . '/', $this->getValue())) { $this->error = 'Invalid value entered.'; return false; @@ -167,9 +167,9 @@ public function validate() $validator = $this->getValidator(); - if (is_callable($validator)) { + if (\is_callable($validator)) { try { - call_user_func_array($validator, [$this->getValue()]); + \call_user_func_array($validator, [$this->getValue()]); } catch (Exception $ex) { $this->error = $ex->getMessage(); diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index 7643c65c6..672f23aa0 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -70,22 +70,22 @@ public function setupInterpolationVars(BaseBuild $build, $url, $applicationVersi $this->interpolationVars['%ENVIRONMENT%'] = $environment; $this->interpolationVars['%SYSTEM_VERSION%'] = $applicationVersion; - putenv('PHP_CENSOR=1'); - putenv('PHP_CENSOR_COMMIT_ID=' . $this->interpolationVars['%COMMIT_ID%']); - putenv('PHP_CENSOR_SHORT_COMMIT_ID=' . $this->interpolationVars['%SHORT_COMMIT_ID%']); - putenv('PHP_CENSOR_COMMITTER_EMAIL=' . $this->interpolationVars['%COMMITTER_EMAIL%']); - putenv('PHP_CENSOR_COMMIT_MESSAGE=' . $this->interpolationVars['%COMMIT_MESSAGE%']); - putenv('PHP_CENSOR_COMMIT_LINK=' . $this->interpolationVars['%COMMIT_LINK%']); - putenv('PHP_CENSOR_PROJECT_ID=' . $this->interpolationVars['%PROJECT_ID%']); - putenv('PHP_CENSOR_PROJECT_TITLE=' . $this->interpolationVars['%PROJECT_TITLE%']); - putenv('PHP_CENSOR_PROJECT_LINK=' . $this->interpolationVars['%PROJECT_LINK%']); - putenv('PHP_CENSOR_BUILD_ID=' . $this->interpolationVars['%BUILD_ID%']); - putenv('PHP_CENSOR_BUILD_PATH=' . $this->interpolationVars['%BUILD_PATH%']); - putenv('PHP_CENSOR_BUILD_LINK=' . $this->interpolationVars['%BUILD_LINK%']); - putenv('PHP_CENSOR_BRANCH=' . $this->interpolationVars['%BRANCH%']); - putenv('PHP_CENSOR_BRANCH_LINK=' . $this->interpolationVars['%BRANCH_LINK%']); - putenv('PHP_CENSOR_ENVIRONMENT=' . $this->interpolationVars['%ENVIRONMENT%']); - putenv('PHP_CENSOR_SYSTEM_VERSION=' . $this->interpolationVars['%SYSTEM_VERSION%']); + \putenv('PHP_CENSOR=1'); + \putenv('PHP_CENSOR_COMMIT_ID=' . $this->interpolationVars['%COMMIT_ID%']); + \putenv('PHP_CENSOR_SHORT_COMMIT_ID=' . $this->interpolationVars['%SHORT_COMMIT_ID%']); + \putenv('PHP_CENSOR_COMMITTER_EMAIL=' . $this->interpolationVars['%COMMITTER_EMAIL%']); + \putenv('PHP_CENSOR_COMMIT_MESSAGE=' . $this->interpolationVars['%COMMIT_MESSAGE%']); + \putenv('PHP_CENSOR_COMMIT_LINK=' . $this->interpolationVars['%COMMIT_LINK%']); + \putenv('PHP_CENSOR_PROJECT_ID=' . $this->interpolationVars['%PROJECT_ID%']); + \putenv('PHP_CENSOR_PROJECT_TITLE=' . $this->interpolationVars['%PROJECT_TITLE%']); + \putenv('PHP_CENSOR_PROJECT_LINK=' . $this->interpolationVars['%PROJECT_LINK%']); + \putenv('PHP_CENSOR_BUILD_ID=' . $this->interpolationVars['%BUILD_ID%']); + \putenv('PHP_CENSOR_BUILD_PATH=' . $this->interpolationVars['%BUILD_PATH%']); + \putenv('PHP_CENSOR_BUILD_LINK=' . $this->interpolationVars['%BUILD_LINK%']); + \putenv('PHP_CENSOR_BRANCH=' . $this->interpolationVars['%BRANCH%']); + \putenv('PHP_CENSOR_BRANCH_LINK=' . $this->interpolationVars['%BRANCH_LINK%']); + \putenv('PHP_CENSOR_ENVIRONMENT=' . $this->interpolationVars['%ENVIRONMENT%']); + \putenv('PHP_CENSOR_SYSTEM_VERSION=' . $this->interpolationVars['%SYSTEM_VERSION%']); } /** @@ -95,10 +95,10 @@ public function setupInterpolationVars(BaseBuild $build, $url, $applicationVersi */ private function realtimeInterpolate($input) { - $input = str_replace('%CURRENT_DATE%', \date('Y-m-d'), $input); - $input = str_replace('%CURRENT_TIME%', \date('H-i-s'), $input); + $input = \str_replace('%CURRENT_DATE%', \date('Y-m-d'), $input); + $input = \str_replace('%CURRENT_TIME%', \date('H-i-s'), $input); - return str_replace('%CURRENT_DATETIME%', \date('Y-m-d_H-i-s'), $input); + return \str_replace('%CURRENT_DATETIME%', \date('Y-m-d_H-i-s'), $input); } /** @@ -113,9 +113,9 @@ public function interpolate($input) { $input = $this->realtimeInterpolate($input); - $keys = array_keys($this->interpolationVars); - $values = array_values($this->interpolationVars); + $keys = \array_keys($this->interpolationVars); + $values = \array_values($this->interpolationVars); - return str_replace($keys, $values, $input); + return \str_replace($keys, $values, $input); } } diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index 048f7f433..6a688a5b4 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -97,22 +97,22 @@ public function executeCommand($args = []) { $this->lastOutput = []; - $this->logger->logDebug('Args: ' . json_encode($args)); + $this->logger->logDebug('Args: ' . \json_encode($args)); - $command = call_user_func_array('sprintf', $args); + $command = \call_user_func_array('sprintf', $args); $this->logger->log('Shell command: ' . $command); $withNoExit = ''; foreach (self::$noExitCommands as $nec) { - if (preg_match("/\b{$nec}\b/", $command)) { + if (\preg_match("/\b{$nec}\b/", $command)) { $withNoExit = $nec; break; } } $cwd = RUNTIME_DIR . 'builds'; - if ($this->buildPath && file_exists($this->buildPath)) { + if ($this->buildPath && \file_exists($this->buildPath)) { $cwd = $this->buildPath; } @@ -126,13 +126,13 @@ public function executeCommand($args = []) $this->logger->logDebug("Assuming command '{$withNoExit}' does not exit properly"); do { - sleep(15); + \sleep(15); $response = []; - exec("ps auxww | grep '{$withNoExit}' | grep -v grep", $response); - $response = array_filter( + \exec("ps auxww | grep '{$withNoExit}' | grep -v grep", $response); + $response = \array_filter( $response, function ($a) { - return strpos($a, $this->buildPath) !== false; + return \strpos($a, $this->buildPath) !== false; } ); } while (!empty($response)); @@ -147,7 +147,7 @@ function ($a) { $lastOutput = $this->replaceIllegalCharacters($process->getOutput()); $lastError = $this->replaceIllegalCharacters($process->getErrorOutput()); - $this->lastOutput = array_filter(explode(PHP_EOL, $lastOutput)); + $this->lastOutput = \array_filter(\explode(PHP_EOL, $lastOutput)); $this->lastError = $lastError; $shouldOutput = ($this->logExecOutput && ($this->verbose || 0 !== $status)); @@ -177,12 +177,12 @@ function ($a) { */ public function replaceIllegalCharacters($utf8String) { - mb_substitute_character(0xFFFD); // is '�' - $legalUtf8String = mb_convert_encoding($utf8String, 'utf8', 'utf8'); + \mb_substitute_character(0xFFFD); // is '�' + $legalUtf8String = \mb_convert_encoding($utf8String, 'utf8', 'utf8'); $regexp = '/[\x00-\x08\x10\x0B\x0C\x0E-\x19\x7F]' . '|[^\x{0}-\x{ffff}]/u'; // more than 3 byte UTF-8 sequences (unsupported in mysql) - return preg_replace($regexp, '�', $legalUtf8String); + return \preg_replace($regexp, '�', $legalUtf8String); } /** @@ -192,7 +192,7 @@ public function replaceIllegalCharacters($utf8String) */ public function getLastOutput() { - return implode(PHP_EOL, $this->lastOutput); + return \implode(PHP_EOL, $this->lastOutput); } /** @@ -213,8 +213,8 @@ public function getLastError() */ protected function findBinaryByPath($binaryPath, $binary) { - if (is_dir($binaryPath) && is_file($binaryPath . '/' . $binary)) { - $this->logger->logDebug(sprintf('Found in %s (binary_path): %s', $binaryPath, $binary)); + if (\is_dir($binaryPath) && \is_file($binaryPath . '/' . $binary)) { + $this->logger->logDebug(\sprintf('Found in %s (binary_path): %s', $binaryPath, $binary)); return $binaryPath . '/' . $binary; } @@ -230,8 +230,8 @@ protected function findBinaryByPath($binaryPath, $binary) */ protected function findBinaryLocal($composerBin, $binary) { - if (is_dir($composerBin) && is_file($composerBin . '/' . $binary)) { - $this->logger->logDebug(sprintf('Found in %s (local): %s', $composerBin, $binary)); + if (\is_dir($composerBin) && \is_file($composerBin . '/' . $binary)) { + $this->logger->logDebug(\sprintf('Found in %s (local): %s', $composerBin, $binary)); return $composerBin . '/' . $binary; } @@ -246,8 +246,8 @@ protected function findBinaryLocal($composerBin, $binary) */ protected function findBinaryGlobal($binary) { - if (is_file($this->rootDir . 'vendor/bin/' . $binary)) { - $this->logger->logDebug(sprintf('Found in %s (global): %s', 'vendor/bin', $binary)); + if (\is_file($this->rootDir . 'vendor/bin/' . $binary)) { + $this->logger->logDebug(\sprintf('Found in %s (global): %s', 'vendor/bin', $binary)); return $this->rootDir . 'vendor/bin/' . $binary; } @@ -264,9 +264,9 @@ protected function findBinaryGlobal($binary) */ protected function findBinarySystem($binary) { - $tempBinary = trim(shell_exec('which ' . $binary)); - if (is_file($tempBinary)) { - $this->logger->logDebug(sprintf('Found in %s (system): %s', '', $binary)); + $tempBinary = \trim(\shell_exec('which ' . $binary)); + if (\is_file($tempBinary)) { + $this->logger->logDebug(\sprintf('Found in %s (system): %s', '', $binary)); return $tempBinary; } @@ -281,16 +281,16 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ { $composerBin = $this->getComposerBinDir($this->buildPath); - if (is_string($binary)) { + if (\is_string($binary)) { $binary = [$binary]; } if ($binaryName) { - array_unshift($binary, ...$binaryName); + \array_unshift($binary, ...$binaryName); } foreach ($binary as $bin) { - $this->logger->logDebug(sprintf('Looking for binary: %s, priority = %s', $bin, $priorityPath)); + $this->logger->logDebug(\sprintf('Looking for binary: %s, priority = %s', $bin, $priorityPath)); if ('binary_path' === $priorityPath) { if ($existedBinary = $this->findBinaryByPath($binaryPath, $bin)) { @@ -359,7 +359,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ } } - throw new RuntimeException(sprintf('Could not find %s', implode('/', $binary))); + throw new RuntimeException(\sprintf('Could not find %s', \implode('/', $binary))); } /** @@ -372,14 +372,14 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ */ public function getComposerBinDir($path) { - if (is_dir($path)) { + if (\is_dir($path)) { $composer = $path . '/composer.json'; - if (is_file($composer)) { - $json = json_decode(file_get_contents($composer)); + if (\is_file($composer)) { + $json = \json_decode(\file_get_contents($composer)); if (isset($json->config->{"bin-dir"})) { return $path . '/' . $json->config->{"bin-dir"}; - } elseif (is_dir($path . '/vendor/bin')) { + } elseif (\is_dir($path . '/vendor/bin')) { return $path . '/vendor/bin'; } } @@ -405,41 +405,41 @@ private function getDefaultEnv() $env = array(); foreach ($_SERVER as $k => $v) { - if (in_array($k, self::$blacklistEnvVars)) { + if (\in_array($k, self::$blacklistEnvVars)) { continue; } - if (is_string($v) && false !== $v = getenv($k)) { + if (\is_string($v) && false !== $v = \getenv($k)) { $env[$k] = $v; } } foreach ($_ENV as $k => $v) { - if (in_array($k, self::$blacklistEnvVars)) { + if (\in_array($k, self::$blacklistEnvVars)) { continue; } - if (is_string($v)) { + if (\is_string($v)) { $env[$k] = $v; } } if (PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 1) { - foreach (getenv() as $k => $v) { - if (in_array($k, self::$blacklistEnvVars)) { + foreach (\getenv() as $k => $v) { + if (\in_array($k, self::$blacklistEnvVars)) { continue; } - if (is_string($v)) { + if (\is_string($v)) { $env[$k] = $v; } } } else { $output = []; - exec('env', $output); + \exec('env', $output); foreach ($output as $o) { - $keyval = explode('=', $o, 2); - if (count($keyval) < 2 || empty($keyval[1])) { + $keyval = \explode('=', $o, 2); + if (\count($keyval) < 2 || empty($keyval[1])) { continue; } - if (in_array($keyval[0], self::$blacklistEnvVars)) { + if (\in_array($keyval[0], self::$blacklistEnvVars)) { continue; } $env[$keyval[0]] = $keyval[1]; diff --git a/src/Helper/Diff.php b/src/Helper/Diff.php index 97e393ae9..902c48aaa 100644 --- a/src/Helper/Diff.php +++ b/src/Helper/Diff.php @@ -20,13 +20,13 @@ public function getLinePositions($diff) $rtn = []; - $diffLines = explode(PHP_EOL, $diff); + $diffLines = \explode(PHP_EOL, $diff); - while (count($diffLines)) { - $line = array_shift($diffLines); + while (\count($diffLines)) { + $line = \array_shift($diffLines); - if (substr($line, 0, 2) == '@@') { - array_unshift($diffLines, $line); + if (\substr($line, 0, 2) == '@@') { + \array_unshift($diffLines, $line); break; } } @@ -35,7 +35,7 @@ public function getLinePositions($diff) $position = 0; foreach ($diffLines as $diffLine) { - if (preg_match('/@@\s+\-[0-9]+\,[0-9]+\s+\+([0-9]+)\,([0-9]+)/', $diffLine, $matches)) { + if (\preg_match('/@@\s+\-[0-9]+\,[0-9]+\s+\+([0-9]+)\,([0-9]+)/', $diffLine, $matches)) { $lineNumber = (int)$matches[1] - 1; } diff --git a/src/Helper/Email.php b/src/Helper/Email.php index 0a66a0ede..fb64e005d 100644 --- a/src/Helper/Email.php +++ b/src/Helper/Email.php @@ -102,13 +102,13 @@ public function getFrom() self::DEFAULT_FROM ); - if (strpos($from, '<') === false) { - return [(string)trim($from) => 'PHP Censor']; + if (\strpos($from, '<') === false) { + return [(string)\trim($from) => 'PHP Censor']; } - preg_match('#^(.*?)<(.*?)>$#ui', $from, $fromParts); + \preg_match('#^(.*?)<(.*?)>$#ui', $from, $fromParts); - return [trim($fromParts[2]) => trim($fromParts[1])]; + return [\trim($fromParts[2]) => \trim($fromParts[1])]; } /** @@ -122,7 +122,7 @@ public function send(Builder $builder = null) { $smtpServer = $this->config->get('php-censor.email_settings.smtp_address'); if (null !== $builder) { - $builder->logDebug(sprintf("SMTP: '%s'", !empty($smtpServer) ? 'true' : 'false')); + $builder->logDebug(\sprintf("SMTP: '%s'", !empty($smtpServer) ? 'true' : 'false')); } $factory = new MailerFactory($this->config->get('php-censor')); @@ -138,15 +138,15 @@ public function send(Builder $builder = null) $message->setContentType('text/html'); } - if (is_array($this->emailCc) && count($this->emailCc)) { + if (\is_array($this->emailCc) && \count($this->emailCc)) { $message->setCc($this->emailCc); } - ob_start(); + \ob_start(); $result = $mailer->send($message); - $rawOutput = ob_get_clean(); + $rawOutput = \ob_get_clean(); if ($rawOutput) { $builder->getBuildLogger()->logWarning($rawOutput); diff --git a/src/Helper/Github.php b/src/Helper/Github.php index ad5dd9d2a..bd093872c 100644 --- a/src/Helper/Github.php +++ b/src/Helper/Github.php @@ -35,7 +35,7 @@ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line return null; } - $url = '/repos/' . strtolower($repo) . '/pulls/' . $pullId . '/comments'; + $url = '/repos/' . \strtolower($repo) . '/pulls/' . $pullId . '/comments'; $params = [ 'body' => $comment, @@ -47,7 +47,7 @@ public function createPullRequestComment($repo, $pullId, $commitId, $file, $line $client = new Client(); $client->post(('https://api.github.com' . $url), [ 'headers' => [ - 'Authorization' => 'Basic ' . base64_encode($token . ':x-oauth-basic'), + 'Authorization' => 'Basic ' . \base64_encode($token . ':x-oauth-basic'), 'Content-Type' => 'application/x-www-form-urlencoded' ], 'json' => $params, @@ -71,7 +71,7 @@ public function createCommitComment($repo, $commitId, $file, $line, $comment) return null; } - $url = '/repos/' . strtolower($repo) . '/commits/' . $commitId . '/comments'; + $url = '/repos/' . \strtolower($repo) . '/commits/' . $commitId . '/comments'; $params = [ 'body' => $comment, @@ -82,7 +82,7 @@ public function createCommitComment($repo, $commitId, $file, $line, $comment) $client = new Client(); $client->post(('https://api.github.com' . $url), [ 'headers' => [ - 'Authorization' => 'Basic ' . base64_encode($token . ':x-oauth-basic'), + 'Authorization' => 'Basic ' . \base64_encode($token . ':x-oauth-basic'), 'Content-Type' => 'application/x-www-form-urlencoded' ], 'json' => $params, diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index 4c8e218a2..a0779eee5 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -43,12 +43,12 @@ class Lang public static function get(...$params) { $string = $params[0]; - if (array_key_exists($string, self::$strings)) { + if (\array_key_exists($string, self::$strings)) { $params[0] = self::$strings[$string]; - return call_user_func_array('sprintf', $params); - } elseif (self::DEFAULT_LANGUAGE !== self::$language && array_key_exists($string, self::$defaultStrings)) { + return \call_user_func_array('sprintf', $params); + } elseif (self::DEFAULT_LANGUAGE !== self::$language && \array_key_exists($string, self::$defaultStrings)) { $params[0] = self::$defaultStrings[$string]; - return call_user_func_array('sprintf', $params); + return \call_user_func_array('sprintf', $params); } return $string; @@ -73,7 +73,7 @@ public static function getLanguage() */ public static function setLanguage($language) { - if (in_array($language, self::$languages)) { + if (\in_array($language, self::$languages)) { self::$language = $language; self::$strings = self::loadLanguage(); return true; @@ -161,12 +161,12 @@ protected static function loadLanguage($language = null) $langFile = SRC_DIR . 'Languages/lang.' . $language . '.php'; - if (!file_exists($langFile)) { + if (!\file_exists($langFile)) { return null; } $strings = include($langFile); - if (is_null($strings) || !is_array($strings) || !count($strings)) { + if (\is_null($strings) || !\is_array($strings) || !\count($strings)) { return null; } @@ -179,8 +179,8 @@ protected static function loadLanguage($language = null) protected static function loadAvailableLanguages() { $matches = []; - foreach (glob(SRC_DIR . 'Languages/lang.*.php') as $file) { - if (preg_match('/lang\.([a-z]{2}\-?[a-z]*)\.php/', $file, $matches)) { + foreach (\glob(SRC_DIR . 'Languages/lang.*.php') as $file) { + if (\preg_match('/lang\.([a-z]{2}\-?[a-z]*)\.php/', $file, $matches)) { self::$languages[] = $matches[1]; } } diff --git a/src/Helper/MailerFactory.php b/src/Helper/MailerFactory.php index 1ee2f6947..059d3f2bf 100644 --- a/src/Helper/MailerFactory.php +++ b/src/Helper/MailerFactory.php @@ -22,7 +22,7 @@ class MailerFactory */ public function __construct($config = []) { - if (!is_array($config)) { + if (!\is_array($config)) { $config = []; } diff --git a/src/Helper/Xml.php b/src/Helper/Xml.php index 679b550c1..e008306e9 100644 --- a/src/Helper/Xml.php +++ b/src/Helper/Xml.php @@ -16,10 +16,10 @@ class Xml */ public static function loadFromFile($filePath) { - stream_filter_register('xml_utf8_clean', 'PHPCensor\Helper\Xml\Utf8CleanFilter'); + \stream_filter_register('xml_utf8_clean', 'PHPCensor\Helper\Xml\Utf8CleanFilter'); try { - $xml = simplexml_load_file('php://filter/read=xml_utf8_clean/resource=' . $filePath); + $xml = \simplexml_load_file('php://filter/read=xml_utf8_clean/resource=' . $filePath); } catch (Exception $ex) { $xml = null; } catch (\Throwable $ex) { // since php7 @@ -28,9 +28,9 @@ public static function loadFromFile($filePath) if (!$xml) { // from https://stackoverflow.com/questions/7766455/how-to-handle-invalid-unicode-with-simplexml/8092672#8092672 - $oldUse = libxml_use_internal_errors(true); + $oldUse = \libxml_use_internal_errors(true); - libxml_clear_errors(); + \libxml_clear_errors(); $dom = new DOMDocument("1.0", "UTF-8"); @@ -38,15 +38,15 @@ public static function loadFromFile($filePath) $dom->validateOnParse = false; $dom->recover = true; - $dom->loadXML(strtr( - file_get_contents($filePath), + $dom->loadXML(\strtr( + \file_get_contents($filePath), ['"' => "'"] // " in attribute names may mislead the parser )); /** @var LibXMLError $xmlError */ - $xmlError = libxml_get_last_error(); + $xmlError = \libxml_get_last_error(); if ($xmlError) { - $warning = sprintf('L%s C%s: %s', $xmlError->line, $xmlError->column, $xmlError->message); + $warning = \sprintf('L%s C%s: %s', $xmlError->line, $xmlError->column, $xmlError->message); print 'WARNING: ignored errors while reading phpunit result, '.$warning."\n"; } @@ -54,10 +54,10 @@ public static function loadFromFile($filePath) new SimpleXMLElement(''); } - $xml = simplexml_import_dom($dom); + $xml = \simplexml_import_dom($dom); - libxml_clear_errors(); - libxml_use_internal_errors($oldUse); + \libxml_clear_errors(); + \libxml_use_internal_errors($oldUse); } return $xml; diff --git a/src/Helper/Xml/Utf8CleanFilter.php b/src/Helper/Xml/Utf8CleanFilter.php index a528c27c9..7b5b733be 100644 --- a/src/Helper/Xml/Utf8CleanFilter.php +++ b/src/Helper/Xml/Utf8CleanFilter.php @@ -18,11 +18,11 @@ class Utf8CleanFilter extends php_user_filter */ public function filter($in, $out, &$consumed, $closing) { - while ($bucket = stream_bucket_make_writeable($in)) { - $bucket->data = preg_replace(self::PATTERN, '', $bucket->data); + while ($bucket = \stream_bucket_make_writeable($in)) { + $bucket->data = \preg_replace(self::PATTERN, '', $bucket->data); $consumed += $bucket->datalen; - stream_bucket_append($out, $bucket); + \stream_bucket_append($out, $bucket); } return PSFS_PASS_ON; diff --git a/src/Http/Request.php b/src/Http/Request.php index 60b7efcbd..f2f8283d7 100644 --- a/src/Http/Request.php +++ b/src/Http/Request.php @@ -22,7 +22,7 @@ public function __construct() $this->parseInput(); $this->data['path'] = $this->getRequestPath(); - $this->data['parts'] = array_values(array_filter(explode('/', $this->data['path']))); + $this->data['parts'] = \array_values(\array_filter(\explode('/', $this->data['path']))); } protected function getRequestPath() @@ -35,17 +35,17 @@ protected function getRequestPath() } if ($_SERVER['SCRIPT_NAME'] != $_SERVER['REQUEST_URI']) { - $scriptPath = str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']); - $path = str_replace($scriptPath, '', $path); + $scriptPath = \str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']); + $path = \str_replace($scriptPath, '', $path); } // Remove index.php from the URL if it is present: - $path = str_replace(['/index.php', 'index.php'], '', $path); + $path = \str_replace(['/index.php', 'index.php'], '', $path); // Also cut out the query string: - $path = explode('?', $path); + $path = \explode('?', $path); - return array_shift($path); + return \array_shift($path); } /** @@ -55,17 +55,17 @@ protected function parseInput() { $params = $_REQUEST; - if (!isset($_SERVER['REQUEST_METHOD']) || in_array($_SERVER['REQUEST_METHOD'], ['PUT', 'DELETE'])) { - $vars = file_get_contents('php://input'); + if (!isset($_SERVER['REQUEST_METHOD']) || \in_array($_SERVER['REQUEST_METHOD'], ['PUT', 'DELETE'])) { + $vars = \file_get_contents('php://input'); - if (!is_string($vars) || strlen(trim($vars)) === 0) { + if (!\is_string($vars) || \strlen(\trim($vars)) === 0) { $vars = ''; } $inputData = []; - parse_str($vars, $inputData); + \parse_str($vars, $inputData); - $params = array_merge($params, $inputData); + $params = \array_merge($params, $inputData); } $this->setParams($params); @@ -105,7 +105,7 @@ public function setParam($key, $value = null) */ public function setParams(array $params) { - $this->params = array_merge($this->params, $params); + $this->params = \array_merge($this->params, $params); } /** @@ -137,7 +137,7 @@ public function isAjax() return false; } - if (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { + if (\strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { return true; } diff --git a/src/Http/Response.php b/src/Http/Response.php index 29e29ec61..25e0ad09e 100644 --- a/src/Http/Response.php +++ b/src/Http/Response.php @@ -8,7 +8,7 @@ class Response public function __construct(Response $createFrom = null) { - if (!is_null($createFrom)) { + if (!\is_null($createFrom)) { $this->data = $createFrom->getData(); } } diff --git a/src/Http/Response/JsonResponse.php b/src/Http/Response/JsonResponse.php index 7310710ac..8f35cd775 100644 --- a/src/Http/Response/JsonResponse.php +++ b/src/Http/Response/JsonResponse.php @@ -17,9 +17,9 @@ public function __construct(Response $createFrom = null) protected function flushBody() { if (isset($this->data['body'])) { - return json_encode($this->data['body']); + return \json_encode($this->data['body']); } - return json_encode(null); + return \json_encode(null); } } diff --git a/src/Http/Router.php b/src/Http/Router.php index 07b88cab5..48b0649fa 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -42,11 +42,11 @@ public function clearRoutes() */ public function register($route, $options = [], $callback = null) { - if (!is_callable($callback)) { + if (!\is_callable($callback)) { throw new InvalidArgumentException('$callback must be callable.'); } - array_unshift($this->routes, ['route' => $route, 'callback' => $callback, 'defaults' => $options]); + \array_unshift($this->routes, ['route' => $route, 'callback' => $callback, 'defaults' => $options]); } public function dispatch() @@ -61,34 +61,34 @@ public function dispatch() $thisController = null; $thisAction = null; - if (array_key_exists('namespace', $route['defaults'])) { + if (\array_key_exists('namespace', $route['defaults'])) { $thisNamespace = $route['defaults']['namespace']; } - if (array_key_exists('controller', $route['defaults'])) { + if (\array_key_exists('controller', $route['defaults'])) { $thisController = $route['defaults']['controller']; } - if (array_key_exists('action', $route['defaults'])) { + if (\array_key_exists('action', $route['defaults'])) { $thisAction = $route['defaults']['action']; } - $routeParts = array_filter(explode('/', $route['route'])); + $routeParts = \array_filter(\explode('/', $route['route'])); $routeMatches = true; - while (count($routeParts)) { - $routePart = array_shift($routeParts); - $pathPart = array_shift($pathParts); + while (\count($routeParts)) { + $routePart = \array_shift($routeParts); + $pathPart = \array_shift($pathParts); switch ($routePart) { case ':namespace': - $thisNamespace = !is_null($pathPart) ? $pathPart : $thisNamespace; + $thisNamespace = !\is_null($pathPart) ? $pathPart : $thisNamespace; break; case ':controller': - $thisController = !is_null($pathPart) ? $pathPart : $thisController; + $thisController = !\is_null($pathPart) ? $pathPart : $thisController; break; case ':action': - $thisAction = !is_null($pathPart) ? $pathPart : $thisAction; + $thisAction = !\is_null($pathPart) ? $pathPart : $thisAction; break; default: if ($routePart != $pathPart) { @@ -96,7 +96,7 @@ public function dispatch() } } - if (!$routeMatches || !count($pathParts)) { + if (!$routeMatches || !\count($pathParts)) { break; } } diff --git a/src/Logging/Handler.php b/src/Logging/Handler.php index ddc98776f..6e621dca7 100644 --- a/src/Logging/Handler.php +++ b/src/Logging/Handler.php @@ -91,7 +91,7 @@ public function handleFatalError(): void } } catch (Exception $e) { $error = new ErrorException( - sprintf( + \sprintf( '%s: %s in %s line %d', $fatalError['type'], $fatalError['message'], diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 102bce146..d93f84f52 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -195,9 +195,9 @@ public function getStatus() */ public function setStatus(int $value) { - if (!in_array($value, $this->allowedStatuses, true)) { + if (!\in_array($value, $this->allowedStatuses, true)) { throw new InvalidArgumentException( - 'Column "status" must be one of: ' . join(', ', $this->allowedStatuses) . '.' + 'Column "status" must be one of: ' . \join(', ', $this->allowedStatuses) . '.' ); } @@ -469,9 +469,9 @@ public function setCommitMessage(?string $value) */ public function getExtra($key = null) { - $data = json_decode($this->data['extra'], true); + $data = \json_decode($this->data['extra'], true); $extra = null; - if (is_null($key)) { + if (\is_null($key)) { $extra = $data; } elseif (isset($data[$key])) { $extra = $data[$key]; @@ -488,7 +488,7 @@ public function getExtra($key = null) */ public function setExtra(array $value) { - $extra = json_encode($value); + $extra = \json_encode($value); if ($this->data['extra'] === $extra) { return false; } @@ -541,9 +541,9 @@ public function getSource() */ public function setSource(?int $value) { - if (!in_array($value, $this->allowedSources, true)) { + if (!\in_array($value, $this->allowedSources, true)) { throw new InvalidArgumentException( - 'Column "source" must be one of: ' . join(', ', $this->allowedSources) . '.' + 'Column "source" must be one of: ' . \join(', ', $this->allowedSources) . '.' ); } @@ -588,7 +588,7 @@ public function setUserId(?int $value) public function getErrorsTotal() { if (null === $this->data['errors_total'] && - !in_array($this->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true)) { + !\in_array($this->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true)) { /** @var BuildStore $store */ $store = $this->storeRegistry->get('Build'); @@ -631,7 +631,7 @@ public function getErrorsTotalPrevious() if (isset($trend[1])) { $previousBuild = $store->getById($trend[1]['build_id']); if ($previousBuild && - !in_array( + !\in_array( $previousBuild->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true @@ -703,7 +703,7 @@ public function setErrorsNew(int $value) */ public function isDebug() { - if (defined('DEBUG_MODE') && DEBUG_MODE) { + if (\defined('DEBUG_MODE') && DEBUG_MODE) { return true; } diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index ef5e9c03b..d77473b70 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -95,10 +95,10 @@ public function setName(string $value) */ public function getBranches() { - return array_filter( - array_map( + return \array_filter( + \array_map( 'trim', - explode("\n", $this->data['branches']) + \explode("\n", $this->data['branches']) ) ); } @@ -110,7 +110,7 @@ public function getBranches() */ public function setBranches(array $value) { - $branches = implode("\n", $value); + $branches = \implode("\n", $value); if ($this->data['branches'] === $branches) { return false; } diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 1fd70e471..9454b41d9 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -250,9 +250,9 @@ public function getType() */ public function setType(string $value) { - if (!in_array($value, static::$allowedTypes, true)) { + if (!\in_array($value, static::$allowedTypes, true)) { throw new InvalidArgumentException( - 'Column "type" must be one of: ' . join(', ', static::$allowedTypes) . '.' + 'Column "type" must be one of: ' . \join(', ', static::$allowedTypes) . '.' ); } @@ -272,9 +272,9 @@ public function setType(string $value) */ public function getAccessInformation($key = null) { - $data = json_decode($this->data['access_information'], true); + $data = \json_decode($this->data['access_information'], true); $accessInformation = null; - if (is_null($key)) { + if (\is_null($key)) { $accessInformation = $data; } elseif (isset($data[$key])) { $accessInformation = $data[$key]; @@ -290,7 +290,7 @@ public function getAccessInformation($key = null) */ public function setAccessInformation(array $value) { - $accessInformation = json_encode($value); + $accessInformation = \json_encode($value); if ($this->data['access_information'] === $accessInformation) { return false; } diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index d3981ca2a..ebf4d1015 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -223,9 +223,9 @@ public function setProviderKey(string $value) */ public function getProviderData($key = null) { - $data = json_decode($this->data['provider_data'], true); + $data = \json_decode($this->data['provider_data'], true); $providerData = null; - if (is_null($key)) { + if (\is_null($key)) { $providerData = $data; } elseif (isset($data[$key])) { $providerData = $data[$key]; @@ -241,7 +241,7 @@ public function getProviderData($key = null) */ public function setProviderData(array $value) { - $providerData = json_encode($value); + $providerData = \json_encode($value); if ($this->data['provider_data'] === $providerData) { return false; } diff --git a/src/Model/Build.php b/src/Model/Build.php index ce64340bf..a9d611351 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -92,7 +92,7 @@ public function getProject() */ public function addExtraValue($name, $value) { - $extra = json_decode($this->data['extra'], true); + $extra = \json_decode($this->data['extra'], true); if ($extra === false) { $extra = []; } @@ -211,7 +211,7 @@ public function getProjectTitle() */ public function storeMeta($key, $value) { - $value = json_encode($value); + $value = \json_encode($value); $this->storeRegistry->get('Build')->setMeta($this->getId(), $key, $value); } @@ -239,8 +239,8 @@ public function handleConfigBeforeClone(Builder $builder) $yamlParser = new YamlParser(); $buildConfig = $yamlParser->parse($buildConfig); - if ($buildConfig && is_array($buildConfig)) { - $builder->logDebug('Config before repository clone (DB): ' . json_encode($buildConfig)); + if ($buildConfig && \is_array($buildConfig)) { + $builder->logDebug('Config before repository clone (DB): ' . \json_encode($buildConfig)); $builder->setConfig($buildConfig); } @@ -266,10 +266,10 @@ protected function handleConfig(Builder $builder, $buildPath) $repositoryConfig = $this->getZeroConfigPlugins(); $repositoryConfigFrom = ''; - if (file_exists($buildPath . '/.php-censor.yml')) { + if (\file_exists($buildPath . '/.php-censor.yml')) { $repositoryConfigFrom = '.php-censor.yml'; $repositoryConfig = $yamlParser->parse( - file_get_contents($buildPath . '/.php-censor.yml') + \file_get_contents($buildPath . '/.php-censor.yml') ); } @@ -282,22 +282,22 @@ protected function handleConfig(Builder $builder, $buildPath) if (!$buildConfig) { $builder->logDebug( - sprintf('Build config from repository (%s)', $repositoryConfigFrom) + \sprintf('Build config from repository (%s)', $repositoryConfigFrom) ); $buildConfig = $repositoryConfig; } elseif ($buildConfig && !$overwriteBuildConfig) { $builder->logDebug( - sprintf('Build config from project (DB) + config from repository (%s)', $repositoryConfigFrom) + \sprintf('Build config from project (DB) + config from repository (%s)', $repositoryConfigFrom) ); - $buildConfig = array_replace_recursive($repositoryConfig, $buildConfig); + $buildConfig = \array_replace_recursive($repositoryConfig, $buildConfig); } elseif ($buildConfig) { $builder->logDebug('Build config from project (DB)'); } - if ($buildConfig && is_array($buildConfig)) { - $builder->logDebug('Final config: ' . json_encode($buildConfig)); + if ($buildConfig && \is_array($buildConfig)) { + $builder->logDebug('Final config: ' . \json_encode($buildConfig)); $builder->setConfig($buildConfig); } @@ -407,7 +407,7 @@ public function getBuildDirectory() $createDate = $this->getCreateDate(); if (empty($this->buildDirectory)) { $this->buildDirectory = $this->getProjectId() . '/' . $this->getId() . '_' . substr( - md5( + \md5( ($this->getId() . '_' . ($createDate ? $createDate->format('Y-m-d H:i:s') : null)) ), 0, @@ -430,7 +430,7 @@ public function getBuildBranchDirectory() $createDate = $this->getCreateDate(); if (empty($this->buildBranchDirectory)) { $this->buildBranchDirectory = $this->getProjectId() . '/' . $this->getBranch() . '_' . substr( - md5( + \md5( ($this->getBranch() . '_' . ($createDate ? $createDate->format('Y-m-d H:i:s') : null)) ), 0, @@ -450,8 +450,8 @@ public function getBuildPath() return null; } - return rtrim( - realpath(RUNTIME_DIR . 'builds'), + return \rtrim( + \realpath(RUNTIME_DIR . 'builds'), '/\\' ) . '/' . $this->getBuildDirectory() . '/'; } @@ -465,18 +465,18 @@ public function removeBuildDirectory($withArtifacts = false) { // Get the path and remove the trailing slash as this may prompt PHP // to see this as a directory even if it's a link. - $buildPath = rtrim($this->getBuildPath(), '/'); + $buildPath = \rtrim($this->getBuildPath(), '/'); - if (!$buildPath || !is_dir($buildPath)) { + if (!$buildPath || !\is_dir($buildPath)) { return; } try { $fileSystem = new Filesystem(); - if (is_link($buildPath)) { + if (\is_link($buildPath)) { // Remove the symlink without using recursive. - exec(sprintf('rm "%s"', $buildPath)); + \exec(\sprintf('rm "%s"', $buildPath)); } else { $fileSystem->remove($buildPath); } @@ -529,7 +529,7 @@ public function getPrettyDuration() $end = new DateTime(); } - $diff = date_diff($start, $end); + $diff = \date_diff($start, $end); $parts = []; foreach (['y', 'm', 'd', 'h', 'i', 's'] as $timePart) { if ($diff->{$timePart} != 0) { @@ -537,7 +537,7 @@ public function getPrettyDuration() } } - return implode(" ", $parts); + return \implode(" ", $parts); } /** @@ -562,9 +562,9 @@ public function createWorkingCopy(Builder $builder, $buildPath) */ protected function writeSshKey() { - $tempKeyFile = tempnam(sys_get_temp_dir(), 'key_'); + $tempKeyFile = \tempnam(\sys_get_temp_dir(), 'key_'); - file_put_contents($tempKeyFile, $this->getProject()->getSshPrivateKey()); + \file_put_contents($tempKeyFile, $this->getProject()->getSshPrivateKey()); return $tempKeyFile; } @@ -586,10 +586,10 @@ protected function writeSshWrapper($keyFile) ssh {$sshFlags} -o IdentityFile={$keyFile} $* OUT; - $tempShFile = tempnam(sys_get_temp_dir(), 'sh_'); + $tempShFile = \tempnam(\sys_get_temp_dir(), 'sh_'); - file_put_contents($tempShFile, $script); - shell_exec('chmod +x "' . $tempShFile . '"'); + \file_put_contents($tempShFile, $script); + \shell_exec('chmod +x "' . $tempShFile . '"'); return $tempShFile; } diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 152671fb8..83c353e6c 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -77,7 +77,7 @@ public function getTagLink() */ public function sendStatusPostback() { - if (!in_array($this->getSource(), Build::$webhookSources, true)) { + if (!\in_array($this->getSource(), Build::$webhookSources, true)) { return false; } @@ -124,9 +124,9 @@ public function sendStatusPostback() $phpCensorUrl = $this->configuration->get('php-censor.url'); - $url = sprintf( + $url = \sprintf( '/2.0/repositories/%s/commit/%s/statuses/build', - (in_array($this->getSource(), Build::$pullRequestSources, true) + (\in_array($this->getSource(), Build::$pullRequestSources, true) ? $this->getExtra('remote_reference') : $project->getReference()), $this->getCommitId() @@ -162,7 +162,7 @@ public function sendStatusPostback() */ protected function getCloneUrl() { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { return 'git@bitbucket.org:' . $this->getProject()->getReference() . '.git'; @@ -192,7 +192,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $skipGitFinalization = false; try { - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { + if (\in_array($this->getSource(), Build::$pullRequestSources, true)) { $helper = new Bitbucket($this->configuration); $diff = $helper->getPullRequestDiff( $this->getProject()->getReference(), @@ -205,7 +205,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $success = $builder->executeCommand($cmd, $cloneTo, $diffFile); - unlink($diffFile); + \unlink($diffFile); $skipGitFinalization = true; } } catch (Exception $ex) { @@ -229,11 +229,11 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul */ protected function writeDiff($cloneTo, $diff) { - $filePath = dirname($cloneTo . '/temp'); + $filePath = \dirname($cloneTo . '/temp'); $diffFile = $filePath . '.patch'; - file_put_contents($diffFile, $diff); - chmod($diffFile, 0600); + \file_put_contents($diffFile, $diff); + \chmod($diffFile, 0600); return $diffFile; } @@ -267,7 +267,7 @@ public function reportError( if ($file) { $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart); - if (!is_null($diffLineNumber)) { + if (!\is_null($diffLineNumber)) { $helper = new Bitbucket($this->configuration); $repo = $this->getProject()->getReference(); diff --git a/src/Model/Build/BitbucketHgBuild.php b/src/Model/Build/BitbucketHgBuild.php index b23846c44..77c91b8c1 100644 --- a/src/Model/Build/BitbucketHgBuild.php +++ b/src/Model/Build/BitbucketHgBuild.php @@ -61,7 +61,7 @@ public function getTagLink() */ protected function getCloneUrl() { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { return 'ssh://hg@bitbucket.org/' . $this->getProject()->getReference(); diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index c0cc5021a..c0e66a7f9 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -93,7 +93,7 @@ public function getFileLinkTemplate() { $reference = $this->getProject()->getReference(); - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { + if (\in_array($this->getSource(), Build::$pullRequestSources, true)) { $reference = $this->getExtra('remote_reference'); } @@ -114,7 +114,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $skipGitFinalization = false; try { - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { + if (\in_array($this->getSource(), Build::$pullRequestSources, true)) { $diff = $this->getPullRequestDiff($builder, $cloneTo, $extra['remote_branch']); $diffFile = $this->writeDiff($builder->buildPath, $diff); @@ -128,7 +128,6 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $success = $builder->executeCommand($applyCmd, $diffFile); } - //unlink($diffFile); $skipGitFinalization = true; } } catch (Exception $ex) { @@ -171,11 +170,11 @@ protected function getPullRequestDiff(Builder $builder, $cloneTo, $targetBranch) */ protected function writeDiff($cloneTo, $diff) { - $filePath = dirname($cloneTo . '/temp'); + $filePath = \dirname($cloneTo . '/temp'); $diffFile = $filePath . '.patch'; - file_put_contents($diffFile, $diff); - chmod($diffFile, 0600); + \file_put_contents($diffFile, $diff); + \chmod($diffFile, 0600); return $diffFile; } diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index a6c99f1cc..5711f9a1a 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -50,7 +50,7 @@ protected function getCloneUrl() */ public function createWorkingCopy(Builder $builder, $buildPath) { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { $success = $this->cloneBySsh($builder, $buildPath); @@ -107,7 +107,7 @@ protected function cloneByHttp(Builder $builder, $cloneTo) $buildSettings = $builder->getConfig('build_settings'); if ($buildSettings && isset($buildSettings['clone_depth']) && (0 < (int)$buildSettings['clone_depth'])) { - $cmd .= ' --depth ' . intval($buildSettings['clone_depth']) . ' '; + $cmd .= ' --depth ' . \intval($buildSettings['clone_depth']) . ' '; } $cmd .= ' -b "%s" "%s" "%s"'; @@ -138,7 +138,7 @@ protected function cloneBySsh(Builder $builder, $cloneTo) $buildSettings = $builder->getConfig('build_settings'); if ($buildSettings && isset($buildSettings['clone_depth']) && (0 < (int)$buildSettings['clone_depth'])) { - $cmd .= ' --depth ' . intval($buildSettings['clone_depth']) . ' '; + $cmd .= ' --depth ' . \intval($buildSettings['clone_depth']) . ' '; } $cmd .= ' -b "%s" "%s" "%s"'; @@ -155,8 +155,8 @@ protected function cloneBySsh(Builder $builder, $cloneTo) } // Remove the key file and git wrapper: - unlink($keyFile); - unlink($gitSshWrapper); + \unlink($keyFile); + \unlink($gitSshWrapper); return $success; } @@ -183,16 +183,16 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul // Always update the commit hash with the actual HEAD hash if ($builder->executeCommand($chdir . ' && git rev-parse HEAD', $cloneTo)) { - $commitId = trim($builder->getLastOutput()); + $commitId = \trim($builder->getLastOutput()); $this->setCommitId($commitId); if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%s %s', $cloneTo, $commitId)) { - $this->setCommitMessage(trim($builder->getLastOutput())); + $this->setCommitMessage(\trim($builder->getLastOutput())); } if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%ae %s', $cloneTo, $commitId)) { - $this->setCommitterEmail(trim($builder->getLastOutput())); + $this->setCommitterEmail(\trim($builder->getLastOutput())); } } diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index ff3d500e7..5790531fb 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -90,7 +90,7 @@ public function getTagLink() */ public function sendStatusPostback() { - if (!in_array($this->getSource(), Build::$webhookSources, true)) { + if (!\in_array($this->getSource(), Build::$webhookSources, true)) { return false; } @@ -165,7 +165,7 @@ public function sendStatusPostback() */ protected function getCloneUrl() { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); $port = $this->getProject()->getAccessInformation('port'); @@ -192,11 +192,11 @@ public function getCommitMessage() $message = parent::getCommitMessage(); $project = $this->getProject(); - if (!is_null($project)) { + if (!\is_null($project)) { $reference = $project->getReference(); $commitLink = '#$1'; - $message = preg_replace('/\#([0-9]+)/', $commitLink, $message); - $message = preg_replace( + $message = \preg_replace('/\#([0-9]+)/', $commitLink, $message); + $message = \preg_replace( '/\@([a-zA-Z0-9_]+)/', '@$1', $message @@ -214,7 +214,7 @@ public function getCommitMessage() public function getFileLinkTemplate() { $reference = $this->getProject()->getReference(); - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { + if (\in_array($this->getSource(), Build::$pullRequestSources, true)) { $reference = $this->getExtra('remote_reference'); } @@ -234,7 +234,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $success = true; try { - if (in_array($this->getSource(), Build::$pullRequestSources, true)) { + if (\in_array($this->getSource(), Build::$pullRequestSources, true)) { $pullRequestId = $this->getExtra('pull_request_number'); $cmd = 'cd "%s" && git checkout -b php-censor/' @@ -287,7 +287,7 @@ public function reportError( if ($file) { $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart); - if (!is_null($diffLineNumber)) { + if (!\is_null($diffLineNumber)) { $helper = new Github($this->configuration); $repo = $this->getProject()->getReference(); diff --git a/src/Model/Build/GitlabBuild.php b/src/Model/Build/GitlabBuild.php index 1f96ecc60..aa648a0ab 100644 --- a/src/Model/Build/GitlabBuild.php +++ b/src/Model/Build/GitlabBuild.php @@ -38,7 +38,7 @@ public function getBranchLink() */ public function getFileLinkTemplate() { - return sprintf( + return \sprintf( '//%s/%s/blob/%s/{FILE}#L{LINE}', $this->getProject()->getAccessInformation('domain'), $this->getProject()->getReference(), @@ -51,7 +51,7 @@ public function getFileLinkTemplate() */ protected function getCloneUrl() { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); $user = $this->getProject()->getAccessInformation('user'); $domain = $this->getProject()->getAccessInformation('domain'); diff --git a/src/Model/Build/GogsBuild.php b/src/Model/Build/GogsBuild.php index 7a478cd47..fb98d87c5 100644 --- a/src/Model/Build/GogsBuild.php +++ b/src/Model/Build/GogsBuild.php @@ -14,7 +14,7 @@ class GogsBuild extends GitBuild */ protected function getCleanedReferenceForLink() { - return preg_replace('/\.git$/i', '', $this->getProject()->getReference()); + return \preg_replace('/\.git$/i', '', $this->getProject()->getReference()); } /** @@ -44,7 +44,7 @@ public function getBranchLink() */ public function getFileLinkTemplate() { - return sprintf( + return \sprintf( '%s/src/%s/{FILE}#L{LINE}', $this->getCleanedReferenceForLink(), $this->getCommitId() diff --git a/src/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php index d49600073..36ec6843e 100644 --- a/src/Model/Build/HgBuild.php +++ b/src/Model/Build/HgBuild.php @@ -49,7 +49,7 @@ protected function getCloneUrl() */ public function createWorkingCopy(Builder $builder, $buildPath) { - $key = trim($this->getProject()->getSshPrivateKey()); + $key = \trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { $success = $this->cloneBySsh($builder, $buildPath); @@ -100,7 +100,7 @@ protected function cloneBySsh(Builder $builder, $cloneTo) } // Remove the key file: - unlink($keyFile); + \unlink($keyFile); return $success; } diff --git a/src/Model/Build/LocalBuild.php b/src/Model/Build/LocalBuild.php index 718b5b6c3..aa0bcaaf4 100644 --- a/src/Model/Build/LocalBuild.php +++ b/src/Model/Build/LocalBuild.php @@ -26,12 +26,12 @@ class LocalBuild extends Build public function createWorkingCopy(Builder $builder, $buildPath) { $reference = $this->getProject()->getReference(); - $reference = substr($reference, -1) == '/' ? substr($reference, 0, -1) : $reference; - $buildPath = substr($buildPath, 0, -1); + $reference = \substr($reference, -1) == '/' ? \substr($reference, 0, -1) : $reference; + $buildPath = \substr($buildPath, 0, -1); // If there's a /config file in the reference directory, it is probably a bare repository // which we'll extract into our build path directly. - if (is_file($reference . '/config') && + if (\is_file($reference . '/config') && true === $this->handleBareRepository($builder, $reference, $buildPath)) { return $this->handleConfig($builder, $buildPath); } @@ -88,13 +88,13 @@ protected function handleBareRepository(Builder $builder, $reference, $buildPath */ protected function handleSymlink(Builder $builder, $reference, $buildPath) { - if (is_link($buildPath) && is_file($buildPath)) { - unlink($buildPath); + if (\is_link($buildPath) && \is_file($buildPath)) { + \unlink($buildPath); } - $builder->log(sprintf('Symlinking: %s to %s', $reference, $buildPath)); + $builder->log(\sprintf('Symlinking: %s to %s', $reference, $buildPath)); - if (!symlink($reference, $buildPath)) { + if (!\symlink($reference, $buildPath)) { $builder->logFailure('Failed to symlink.'); return false; } diff --git a/src/Model/Build/SvnBuild.php b/src/Model/Build/SvnBuild.php index 4772318bd..826f23542 100644 --- a/src/Model/Build/SvnBuild.php +++ b/src/Model/Build/SvnBuild.php @@ -22,15 +22,15 @@ class SvnBuild extends Build */ protected function getCloneUrl() { - $url = rtrim($this->getProject()->getReference(), '/') . '/'; - $branch = ltrim($this->getBranch(), '/'); + $url = \rtrim($this->getProject()->getReference(), '/') . '/'; + $branch = \ltrim($this->getBranch(), '/'); // For empty default branch or default branch name like "/trunk" or "trunk" (-> "trunk") if (empty($branch) || $branch == 'trunk') { $url .= 'trunk'; // For default branch with standard default branch directory ("branches") like "/branch-1" or "branch-1" // (-> "branches/branch-1") - } elseif (false === strpos($branch, '/')) { + } elseif (false === \strpos($branch, '/')) { $url .= 'branches/' . $branch; // For default branch with non-standard branch directory like "/branch/branch-1" or "branch/branch-1" // (-> "branch/branch-1") @@ -52,14 +52,14 @@ protected function extendSvnCommandFromConfig(Builder $builder) $buildSettings = $builder->getConfig('build_settings'); if ($buildSettings) { - if (isset($buildSettings['svn']) && is_array($buildSettings['svn'])) { + if (isset($buildSettings['svn']) && \is_array($buildSettings['svn'])) { foreach ($buildSettings['svn'] as $key => $value) { $cmd .= " --${key} ${value} "; } } if (isset($buildSettings['clone_depth']) && 0 < (int)$buildSettings['clone_depth']) { - $cmd .= ' --depth ' . intval($buildSettings['clone_depth']) . ' '; + $cmd .= ' --depth ' . \intval($buildSettings['clone_depth']) . ' '; } } @@ -137,8 +137,8 @@ protected function cloneBySsh(Builder $builder, $cloneTo) $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo); // Remove the key file and svn wrapper: - unlink($keyFile); - unlink($sshWrapper); + \unlink($keyFile); + \unlink($sshWrapper); return $success; } diff --git a/src/Model/BuildError.php b/src/Model/BuildError.php index cfc5411ef..d37089e0f 100644 --- a/src/Model/BuildError.php +++ b/src/Model/BuildError.php @@ -81,7 +81,7 @@ public static function getSeverityName($severity) */ public static function generateHash($plugin, $file, $lineStart, $lineEnd, $severity, $message) { - return md5($plugin . $file . $lineStart . $lineEnd . $severity . $message); + return \md5($plugin . $file . $lineStart . $lineEnd . $severity . $message); } /** diff --git a/src/Model/Project.php b/src/Model/Project.php index a5c10e52d..3c18bd735 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -61,8 +61,8 @@ public function getLatestBuild($branch, $status = null) $order = ['id' => 'DESC']; $builds = $this->storeRegistry->get('Build')->getWhere($criteria, 1, 0, $order); - if (is_array($builds['items']) && count($builds['items'])) { - $latest = array_shift($builds['items']); + if (\is_array($builds['items']) && \count($builds['items'])) { + $latest = \array_shift($builds['items']); if (isset($latest) && $latest instanceof Build) { return $latest; @@ -88,8 +88,8 @@ public function getPreviousBuild($branch) $order = ['id' => 'DESC']; $builds = $this->storeRegistry->get('Build')->getWhere($criteria, 1, 1, $order); - if (is_array($builds['items']) && count($builds['items'])) { - $previous = array_shift($builds['items']); + if (\is_array($builds['items']) && \count($builds['items'])) { + $previous = \array_shift($builds['items']); if (isset($previous) && $previous instanceof Build) { return $previous; @@ -199,12 +199,12 @@ public function setEnvironments($value) { $yamlParser = new YamlParser(); $environmentsConfig = $yamlParser->parse($value); - $environmentsNames = !empty($environmentsConfig) ? array_keys($environmentsConfig) : []; + $environmentsNames = !empty($environmentsConfig) ? \array_keys($environmentsConfig) : []; $currentEnvironments = $this->getEnvironmentsObjects(); $store = $this->getEnvironmentStore(); foreach ($currentEnvironments['items'] as $environment) { /** @var Environment $environment */ - $key = array_search($environment->getName(), $environmentsNames); + $key = \array_search($environment->getName(), $environmentsNames); if ($key !== false) { // already exist unset($environmentsNames[$key]); @@ -240,7 +240,7 @@ public function getEnvironmentsNamesByBranch($branch) $defaultBranch = ($branch === $this->getDefaultBranch()); foreach ($environments['items'] as $environment) { /** @var Environment $environment */ - if ($defaultBranch || in_array($branch, $environment->getBranches())) { + if ($defaultBranch || \in_array($branch, $environment->getBranches())) { $environmentsIds[] = $environment->getId(); } } diff --git a/src/Plugin.php b/src/Plugin.php index b27b09aee..ff57d608d 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -95,21 +95,21 @@ public function __construct(Builder $builder, Build $build, array $options = []) // Plugin option overwrite builder options for priority_path and binary_path if (!empty($options['priority_path']) && - in_array($options['priority_path'], self::AVAILABLE_PRIORITY_PATHS, true)) { + \in_array($options['priority_path'], self::AVAILABLE_PRIORITY_PATHS, true)) { $this->priorityPath = $options['priority_path']; } else { $this->priorityPath = $this->builder->priorityPath; } if (!empty($options['binary_name'])) { - if (is_array($options['binary_name'])) { + if (\is_array($options['binary_name'])) { $this->binaryName = $options['binary_name']; } else { $this->binaryName = [(string)$options['binary_name']]; } } - $this->builder->logDebug('Plugin options: ' . json_encode($options)); + $this->builder->logDebug('Plugin options: ' . \json_encode($options)); } /** @@ -125,15 +125,15 @@ protected function normalizePath($rawPath) $normalizedPath = $this->build->getBuildPath() . $normalizedPath; } - $realPath = realpath($normalizedPath); + $realPath = \realpath($normalizedPath); return (false !== $realPath) - ? rtrim($realPath, '/\\') . '/' - : rtrim( - str_replace( + ? \rtrim($realPath, '/\\') . '/' + : \rtrim( + \str_replace( '//', '/', - str_replace('/./', '/', $normalizedPath) + \str_replace('/./', '/', $normalizedPath) ), '/\\' ) . '/'; @@ -157,15 +157,15 @@ protected function normalizeBinaryPath() $binaryPath = $this->builder->binaryPath; } - $realPath = realpath($binaryPath); + $realPath = \realpath($binaryPath); return (false !== $realPath) - ? rtrim($realPath, '/\\') . '/' - : rtrim( - str_replace( + ? \rtrim($realPath, '/\\') . '/' + : \rtrim( + \str_replace( '//', '/', - str_replace('/./', '/', $binaryPath) + \str_replace('/./', '/', $binaryPath) ), '/\\' ) . '/'; @@ -176,7 +176,7 @@ protected function normalizeBinaryPath() */ protected function normalizeDirectory() { - if (!empty($this->options['directory']) && is_array($this->options['directory'])) { + if (!empty($this->options['directory']) && \is_array($this->options['directory'])) { return $this->builder->directory; } @@ -184,7 +184,7 @@ protected function normalizeDirectory() if (!empty($this->options['directory'])) { $optionDirectory = $this->builder->interpolate($this->options['directory']); - if ('/' !== substr($optionDirectory, 0, 1)) { + if ('/' !== \substr($optionDirectory, 0, 1)) { $directory = $this->build->getBuildPath(); } @@ -193,15 +193,15 @@ protected function normalizeDirectory() $directory = $this->builder->directory; } - $realPath = realpath($directory); + $realPath = \realpath($directory); $finalDirectory = (false !== $realPath) - ? rtrim($realPath, '/\\') . '/' - : rtrim( - str_replace( + ? \rtrim($realPath, '/\\') . '/' + : \rtrim( + \str_replace( '//', '/', - str_replace('/./', '/', $directory) + \str_replace('/./', '/', $directory) ), '/\\' ) . '/'; @@ -219,37 +219,37 @@ protected function normalizeIgnore() $ignore = $this->builder->ignore; if (!empty($this->options['ignore'])) { - $ignore = array_merge($ignore, $this->options['ignore']); + $ignore = \array_merge($ignore, $this->options['ignore']); } $baseDirectory = $this->builder->buildPath; - array_walk($ignore, function (&$value) use ($baseDirectory) { + \array_walk($ignore, function (&$value) use ($baseDirectory) { $value = $this->builder->interpolate($value); - if ('/' !== substr($value, 0, 1)) { + if ('/' !== \substr($value, 0, 1)) { $value = $baseDirectory . $value; } - clearstatcache(true); - $realPath = realpath($value); + \clearstatcache(true); + $realPath = \realpath($value); $value = (false !== $realPath) ? $realPath : $value; - $value = str_replace("/./", '/', $value); - $value = rtrim( - str_replace( + $value = \str_replace("/./", '/', $value); + $value = \rtrim( + \str_replace( '//', '/', - str_replace($baseDirectory, '', $value) + \str_replace($baseDirectory, '', $value) ), '/\\' ); }); - return array_unique($ignore); + return \array_unique($ignore); } /** diff --git a/src/Plugin/Behat.php b/src/Plugin/Behat.php index 8a21a840c..86afc1b1a 100644 --- a/src/Plugin/Behat.php +++ b/src/Plugin/Behat.php @@ -49,7 +49,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) public function execute() { if (!$this->executable) { - $this->builder->logFailure(sprintf('Could not find %s', 'behat')); + $this->builder->logFailure(\sprintf('Could not find %s', 'behat')); return false; } @@ -73,30 +73,30 @@ public function parseBehatOutput() { $output = $this->builder->getLastOutput(); - $parts = explode('---', $output); + $parts = \explode('---', $output); - if (count($parts) <= 1) { + if (\count($parts) <= 1) { return [0, []]; } - $lines = explode(PHP_EOL, $parts[1]); + $lines = \explode(PHP_EOL, $parts[1]); $storeFailures = false; $data = []; foreach ($lines as $line) { - $line = trim($line); + $line = \trim($line); if ('Failed scenarios:' == $line) { $storeFailures = true; continue; } - if (strpos($line, ':') === false) { + if (\strpos($line, ':') === false) { $storeFailures = false; } if ($storeFailures) { - $lineParts = explode(':', $line); + $lineParts = \explode(':', $line); $data[] = [ 'file' => $lineParts[0], 'line' => $lineParts[1], @@ -113,7 +113,7 @@ public function parseBehatOutput() } } - $errorCount = count($data); + $errorCount = \count($data); return [$errorCount, $data]; } diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index 7c2c9fb1f..0cf7e2376 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -94,8 +94,8 @@ public function __construct(Builder $builder, Build $build, array $options = []) $chart = APP_URL . 'artifacts/pdepend/' . $buildDirectory . '/chart.svg'; $pyramid = APP_URL . 'artifacts/pdepend/' . $buildDirectory . '/pyramid.svg'; - $this->message .= sprintf('![Chart](%s "Pdepend Chart")', $chart); - $this->message .= sprintf('![Pyramid](%s "Pdepend Pyramid")', $pyramid) . PHP_EOL; + $this->message .= \sprintf('![Chart](%s "Pdepend Chart")', $chart); + $this->message .= \sprintf('![Pyramid](%s "Pdepend Pyramid")', $pyramid) . PHP_EOL; $this->message .= $summary . PHP_EOL; } } @@ -149,9 +149,9 @@ public function execute() */ protected function findPullRequestsByBranch() { - $endpoint = sprintf('/projects/%s/repos/%s/pull-requests', $this->projectKey, $this->repositorySlug); + $endpoint = \sprintf('/projects/%s/repos/%s/pull-requests', $this->projectKey, $this->repositorySlug); $response = $this->apiRequest($endpoint)->getBody(); - $response = json_decode($response, true); + $response = \json_decode($response, true); foreach ($response['values'] as $pullRequest) { if ($pullRequest['fromRef']['displayId'] === $this->getBuild()->getBranch()) { @@ -164,7 +164,7 @@ protected function findPullRequestsByBranch() protected function getTargetBranchForPullRequest($pullRequestId) { - $endpoint = sprintf( + $endpoint = \sprintf( '/projects/%s/repos/%s/pull-requests/%d', $this->projectKey, $this->repositorySlug, @@ -172,7 +172,7 @@ protected function getTargetBranchForPullRequest($pullRequestId) ); $response = $this->apiRequest($endpoint)->getBody(); - $response = json_decode($response, true); + $response = \json_decode($response, true); return $response['toRef']['displayId']; } @@ -184,7 +184,7 @@ protected function getTargetBranchForPullRequest($pullRequestId) */ protected function createCommentInPullRequest($pullRequestId, $message) { - $endpoint = sprintf( + $endpoint = \sprintf( '/projects/%s/repos/%s/pull-requests/%s/comments', $this->projectKey, $this->repositorySlug, @@ -192,7 +192,7 @@ protected function createCommentInPullRequest($pullRequestId, $message) ); $response = $this->apiRequest($endpoint, 'post', ['text' => $message])->getBody(); - $response = json_decode($response, true); + $response = \json_decode($response, true); return (int)$response['id']; } @@ -215,7 +215,7 @@ protected function createTaskForCommentInPullRequest($commentId, $message) protected function updateBuild() { - $endpoint = sprintf( + $endpoint = \sprintf( '/commits/%s', $this->getBuild()->getCommitId() ); @@ -260,8 +260,8 @@ protected function prepareResult($targetBranch) return []; } - $plugins = array_unique(array_merge(array_keys($targetBranchBuildStats), array_keys($currentBranchBuildStats))); - sort($plugins); + $plugins = \array_unique(\array_merge(\array_keys($targetBranchBuildStats), \array_keys($currentBranchBuildStats))); + \sort($plugins); $result = []; foreach ($plugins as $plugin) { @@ -297,13 +297,13 @@ public function getPhpUnitCoverage($targetBranch) ); $targetBranchCoverage = []; - if (!is_null($latestTargetBuildId) && !is_null($targetMetaData)) { - $targetBranchCoverage = json_decode($targetMetaData->getMetaValue(), true); + if (!\is_null($latestTargetBuildId) && !\is_null($targetMetaData)) { + $targetBranchCoverage = \json_decode($targetMetaData->getMetaValue(), true); } $currentBranchCoverage = []; - if (!is_null($currentMetaData)) { - $currentBranchCoverage = json_decode($currentMetaData->getMetaValue(), true); + if (!\is_null($currentMetaData)) { + $currentBranchCoverage = \json_decode($currentMetaData->getMetaValue(), true); } return new Plugin\Util\BitbucketNotifyPhpUnitResult( @@ -321,7 +321,7 @@ protected function buildResultComparator(array $plugins) { $maxPluginNameLength = 20; if (!empty($plugins)) { - $maxPluginNameLength = max(array_map('strlen', $plugins)); + $maxPluginNameLength = \max(\array_map('strlen', $plugins)); } $lines = []; @@ -334,12 +334,12 @@ protected function buildResultComparator(array $plugins) protected function reportGenerator(array $stats) { - $statsString = trim(implode(PHP_EOL, $stats)); + $statsString = \trim(\implode(PHP_EOL, $stats)); if (empty($stats)) { $statsString = 'no changes between your branch and target branch'; } - $message = str_replace(['%STATS%'], [$statsString], $this->message); + $message = \str_replace(['%STATS%'], [$statsString], $this->message); return $this->builder->interpolate($message); } diff --git a/src/Plugin/CleanBuild.php b/src/Plugin/CleanBuild.php index 4ba4e5163..b2c6dc9f6 100644 --- a/src/Plugin/CleanBuild.php +++ b/src/Plugin/CleanBuild.php @@ -31,7 +31,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->removeFiles = isset($options['remove']) && is_array($options['remove']) ? $options['remove'] : []; + $this->removeFiles = isset($options['remove']) && \is_array($options['remove']) ? $options['remove'] : []; } /** diff --git a/src/Plugin/Codeception.php b/src/Plugin/Codeception.php index f03f80c50..afafeacd5 100644 --- a/src/Plugin/Codeception.php +++ b/src/Plugin/Codeception.php @@ -66,7 +66,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (isset($options['output_path'])) { - array_unshift($this->outputPath, $options['output_path']); + \array_unshift($this->outputPath, $options['output_path']); } $this->executable = $this->findBinary(['codecept', 'codecept.phar']); @@ -77,7 +77,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) */ public static function canExecuteOnStage($stage, Build $build) { - return (Build::STAGE_TEST === $stage && !is_null(self::findConfigFile($build->getBuildPath()))); + return (Build::STAGE_TEST === $stage && !\is_null(self::findConfigFile($build->getBuildPath()))); } /** @@ -87,11 +87,11 @@ public static function canExecuteOnStage($stage, Build $build) */ public static function findConfigFile($buildPath) { - if (file_exists($buildPath . 'codeception.yml')) { + if (\file_exists($buildPath . 'codeception.yml')) { return $buildPath . 'codeception.yml'; } - if (file_exists($buildPath . 'codeception.dist.yml')) { + if (\file_exists($buildPath . 'codeception.dist.yml')) { return $buildPath . 'codeception.dist.yml'; } @@ -122,7 +122,7 @@ protected function runConfigFile() $codeception = $this->executable; if (!$codeception) { - $this->builder->logFailure(sprintf('Could not find "%s" binary', 'codecept')); + $this->builder->logFailure(\sprintf('Could not find "%s" binary', 'codecept')); return false; } @@ -135,24 +135,24 @@ protected function runConfigFile() } $parser = new YamlParser(); - $yaml = file_get_contents($this->ymlConfigFile); + $yaml = \file_get_contents($this->ymlConfigFile); $config = (array)$parser->parse($yaml); $trueReportXmlPath = null; if ($config && isset($config['paths']['log'])) { - $trueReportXmlPath = rtrim($config['paths']['log'], '/\\') . '/'; + $trueReportXmlPath = \rtrim($config['paths']['log'], '/\\') . '/'; } - if (!file_exists($trueReportXmlPath . 'report.xml')) { + if (!\file_exists($trueReportXmlPath . 'report.xml')) { foreach ($this->outputPath as $outputPath) { - $trueReportXmlPath = rtrim($outputPath, '/\\') . '/'; - if (file_exists($trueReportXmlPath . 'report.xml')) { + $trueReportXmlPath = \rtrim($outputPath, '/\\') . '/'; + if (\file_exists($trueReportXmlPath . 'report.xml')) { break; } } } - if (!file_exists($trueReportXmlPath . 'report.xml')) { + if (!\file_exists($trueReportXmlPath . 'report.xml')) { $this->builder->logFailure('"report.xml" file can not be found in configured "output_path!"'); return false; @@ -169,7 +169,7 @@ protected function runConfigFile() // NOTE: Codeception does not use stderr, so failure can only be detected // through tests - $success = $success && (intval($meta['failures']) < 1); + $success = $success && (\intval($meta['failures']) < 1); $this->build->storeMeta((self::pluginName() . '-meta'), $meta); $this->build->storeMeta((self::pluginName() . '-data'), $output); diff --git a/src/Plugin/Composer.php b/src/Plugin/Composer.php index 8baea255b..ff99d9f73 100644 --- a/src/Plugin/Composer.php +++ b/src/Plugin/Composer.php @@ -44,24 +44,24 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['composer', 'composer.phar']); - if (array_key_exists('action', $options)) { + if (\array_key_exists('action', $options)) { $this->action = $options['action']; } - if (array_key_exists('prefer_dist', $options)) { + if (\array_key_exists('prefer_dist', $options)) { $this->preferDist = (bool)$options['prefer_dist']; } - if (array_key_exists('prefer_source', $options)) { + if (\array_key_exists('prefer_source', $options)) { $this->preferDist = false; $this->preferSource = (bool)$options['prefer_source']; } - if (array_key_exists('no_dev', $options)) { + if (\array_key_exists('no_dev', $options)) { $this->noDev = (bool)$options['no_dev']; } - if (array_key_exists('ignore_platform_reqs', $options)) { + if (\array_key_exists('ignore_platform_reqs', $options)) { $this->ignorePlatformReqs = (bool)$options['ignore_platform_reqs']; } } @@ -73,7 +73,7 @@ public static function canExecuteOnStage($stage, Build $build) { $path = $build->getBuildPath() . '/composer.json'; - if (file_exists($path) && Build::STAGE_SETUP == $stage) { + if (\file_exists($path) && Build::STAGE_SETUP == $stage) { return true; } diff --git a/src/Plugin/CopyBuild.php b/src/Plugin/CopyBuild.php index 9891dc149..1ec10b212 100644 --- a/src/Plugin/CopyBuild.php +++ b/src/Plugin/CopyBuild.php @@ -52,9 +52,9 @@ public function execute() $this->wipeExistingDirectory(); - if (is_dir($this->directory)) { + if (\is_dir($this->directory)) { throw new RuntimeException( - sprintf( + \sprintf( 'Directory "%s" already exists! Use "wipe" option if you want to delete directory before copy.', $this->directory ) @@ -62,7 +62,7 @@ public function execute() } $cmd = 'cd "%s" && mkdir -p "%s" && cp -R %s/. "%s"'; - $success = $this->builder->executeCommand($cmd, $buildPath, $this->directory, rtrim($buildPath, '/'), $this->directory); + $success = $this->builder->executeCommand($cmd, $buildPath, $this->directory, \rtrim($buildPath, '/'), $this->directory); $this->deleteIgnoredFiles(); @@ -76,17 +76,17 @@ public function execute() */ protected function wipeExistingDirectory() { - if ($this->wipe === true && $this->directory !== '/' && is_dir($this->directory)) { + if ($this->wipe === true && $this->directory !== '/' && \is_dir($this->directory)) { $cmd = 'cd "%s" && rm -Rf "%s"'; $success = $this->builder->executeCommand($cmd, $this->builder->buildPath, $this->directory); if (!$success) { throw new RuntimeException( - sprintf('Failed to wipe existing directory "%s" before copy!', $this->directory) + \sprintf('Failed to wipe existing directory "%s" before copy!', $this->directory) ); } - clearstatcache(); + \clearstatcache(); } } diff --git a/src/Plugin/DeployerOrg.php b/src/Plugin/DeployerOrg.php index beeffad0e..e2a41d0b6 100644 --- a/src/Plugin/DeployerOrg.php +++ b/src/Plugin/DeployerOrg.php @@ -105,7 +105,7 @@ protected function getVerbosityOption($verbosity) 'quiet' => 'q' ]; - $verbosity = strtolower(trim($verbosity)); + $verbosity = \strtolower(\trim($verbosity)); if ($verbosity !== 'normal') { return '-' . $logLevelList[$verbosity]; } else { @@ -141,6 +141,6 @@ protected function getOptions($config) $options[] = '--file=' . $config['file']; } - return implode(' ', $options); + return \implode(' ', $options); } } diff --git a/src/Plugin/EmailNotify.php b/src/Plugin/EmailNotify.php index f0e083b67..3072175fa 100644 --- a/src/Plugin/EmailNotify.php +++ b/src/Plugin/EmailNotify.php @@ -37,7 +37,7 @@ public function execute() // Without some email addresses in the yml file then we // can't do anything. - if (count($addresses) == 0) { + if (\count($addresses) == 0) { return false; } @@ -48,7 +48,7 @@ public function execute() $view = $this->getMailTemplate(); } catch (RuntimeException $e) { $this->builder->log( - sprintf('Unknown mail template "%s", falling back to default.', $this->options['template']), + \sprintf('Unknown mail template "%s", falling back to default.', $this->options['template']), LogLevel::WARNING ); $view = $this->getDefaultMailTemplate(); @@ -65,13 +65,13 @@ public function execute() $sendFailures = $this->sendSeparateEmails( $addresses, - sprintf("PHP Censor - %s - %s", $projectName, $buildStatus), + \sprintf("PHP Censor - %s - %s", $projectName, $buildStatus), $body ); // This is a success if we've not failed to send anything. - $this->builder->log(sprintf('%d emails sent.', (count($addresses) - $sendFailures))); - $this->builder->log(sprintf('%d emails failed to send.', $sendFailures)); + $this->builder->log(\sprintf('%d emails sent.', (\count($addresses) - $sendFailures))); + $this->builder->log(\sprintf('%d emails failed to send.', $sendFailures)); return ($sendFailures === 0); } @@ -93,7 +93,7 @@ protected function sendEmail($toAddress, $ccList, $subject, $body) $email->setBody($body); $email->setHtml(true); - if (is_array($ccList) && count($ccList)) { + if (\is_array($ccList) && \count($ccList)) { foreach ($ccList as $address) { $email->addCc($address, $address); } @@ -137,8 +137,8 @@ protected function getEmailAddresses() $addresses = []; $committer = $this->build->getCommitterEmail(); - $this->builder->logDebug(sprintf("Committer email: '%s'", $committer)); - $this->builder->logDebug(sprintf( + $this->builder->logDebug(\sprintf("Committer email: '%s'", $committer)); + $this->builder->logDebug(\sprintf( "Committer option: '%s'", (!empty($this->options['committer']) && $this->options['committer']) ? 'true' : 'false' )); @@ -149,18 +149,18 @@ protected function getEmailAddresses() } } - $this->builder->logDebug(sprintf( + $this->builder->logDebug(\sprintf( "Addresses option: '%s'", - (!empty($this->options['addresses']) && is_array($this->options['addresses'])) ? implode(', ', $this->options['addresses']) : 'false' + (!empty($this->options['addresses']) && \is_array($this->options['addresses'])) ? \implode(', ', $this->options['addresses']) : 'false' )); - if (!empty($this->options['addresses']) && is_array($this->options['addresses'])) { + if (!empty($this->options['addresses']) && \is_array($this->options['addresses'])) { foreach ($this->options['addresses'] as $address) { $addresses[] = $address; } } - $this->builder->logDebug(sprintf( + $this->builder->logDebug(\sprintf( "Default mailTo option: '%s'", !empty($this->options['default_mailto_address']) ? $this->options['default_mailto_address'] : 'false' )); @@ -169,7 +169,7 @@ protected function getEmailAddresses() $addresses[] = $this->options['default_mailto_address']; } - return array_unique($addresses); + return \array_unique($addresses); } /** diff --git a/src/Plugin/Env.php b/src/Plugin/Env.php index 234a5fa07..0a40893cd 100644 --- a/src/Plugin/Env.php +++ b/src/Plugin/Env.php @@ -26,15 +26,15 @@ public function execute() { $success = true; foreach ($this->options as $key => $value) { - if (is_numeric($key)) { + if (\is_numeric($key)) { // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar" - $envVar = is_array($value)? key($value).'='.current($value): $value; + $envVar = \is_array($value) ? \key($value) . '=' . \current($value): $value; } else { // This allows the standard syntax: "FOO: bar" $envVar = "$key=$value"; } - if (!putenv($this->builder->interpolate($envVar))) { + if (!\putenv($this->builder->interpolate($envVar))) { $success = false; $this->builder->logFailure('Unable to set environment variable'); } diff --git a/src/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php index 9012a7ed4..495b478ac 100644 --- a/src/Plugin/FlowdockNotify.php +++ b/src/Plugin/FlowdockNotify.php @@ -40,7 +40,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - if (!is_array($options) || (!isset($options['api_key']) && !isset($options['auth_token']))) { + if (!\is_array($options) || (!isset($options['api_key']) && !isset($options['auth_token']))) { throw new InvalidArgumentException('Please define the "auth_token" for Flowdock Notify plugin!'); } @@ -72,7 +72,7 @@ public function execute() ->setContent($message); if (!$push->sendTeamInboxMessage($flowMessage, ['connect_timeout' => 5000, 'timeout' => 5000])) { - throw new RuntimeException(sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors())); + throw new RuntimeException(\sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors())); } return true; } diff --git a/src/Plugin/Git.php b/src/Plugin/Git.php index 9d2903e21..5ee08922c 100644 --- a/src/Plugin/Git.php +++ b/src/Plugin/Git.php @@ -40,7 +40,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) public function execute() { // Check if there are any actions to be run for the branch we're running on: - if (!array_key_exists($this->build->getBranch(), $this->actions)) { + if (!\array_key_exists($this->build->getBranch(), $this->actions)) { return true; } @@ -88,7 +88,7 @@ protected function runAction($action, array $options = []) */ protected function runMergeAction($options) { - if (array_key_exists('branch', $options)) { + if (\array_key_exists('branch', $options)) { $cmd = 'cd "%s" && git checkout %s && git merge "%s"'; $path = $this->builder->buildPath; return $this->builder->executeCommand($cmd, $path, $options['branch'], $this->build->getBranch()); @@ -102,14 +102,14 @@ protected function runMergeAction($options) */ protected function runTagAction($options) { - $tagName = date('Ymd-His'); - $message = sprintf('Tag created by PHP Censor: %s', date('Y-m-d H:i:s')); + $tagName = \date('Ymd-His'); + $message = \sprintf('Tag created by PHP Censor: %s', \date('Y-m-d H:i:s')); - if (array_key_exists('name', $options)) { + if (\array_key_exists('name', $options)) { $tagName = $this->builder->interpolate($options['name']); } - if (array_key_exists('message', $options)) { + if (\array_key_exists('message', $options)) { $message = $this->builder->interpolate($options['message']); } @@ -127,11 +127,11 @@ protected function runPullAction($options) $branch = $this->build->getBranch(); $remote = 'origin'; - if (array_key_exists('branch', $options)) { + if (\array_key_exists('branch', $options)) { $branch = $this->builder->interpolate($options['branch']); } - if (array_key_exists('remote', $options)) { + if (\array_key_exists('remote', $options)) { $remote = $this->builder->interpolate($options['remote']); } @@ -148,11 +148,11 @@ protected function runPushAction($options) $branch = $this->build->getBranch(); $remote = 'origin'; - if (array_key_exists('branch', $options)) { + if (\array_key_exists('branch', $options)) { $branch = $this->builder->interpolate($options['branch']); } - if (array_key_exists('remote', $options)) { + if (\array_key_exists('remote', $options)) { $remote = $this->builder->interpolate($options['remote']); } diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index c9ee6a52f..480277f38 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -81,7 +81,7 @@ public function execute() $message = $this->builder->interpolate($this->message); $result = true; - if (is_array($this->room)) { + if (\is_array($this->room)) { foreach ($this->room as $room) { if (!$hipChat->message_room($room, 'PHP Censor', $message, $this->notify, $this->color)) { $result = false; diff --git a/src/Plugin/IrcNotify.php b/src/Plugin/IrcNotify.php index e966d2b7d..7aed33a0e 100644 --- a/src/Plugin/IrcNotify.php +++ b/src/Plugin/IrcNotify.php @@ -63,8 +63,8 @@ public function execute() $this->port = 6667; } - $sock = fsockopen($this->server, $this->port); - stream_set_timeout($sock, 1); + $sock = \fsockopen($this->server, $this->port); + \stream_set_timeout($sock, 1); $connectCommands = [ 'USER ' . $this->nick . ' 0 * :' . $this->nick, @@ -74,7 +74,7 @@ public function execute() $this->executeIrcCommand($sock, 'JOIN ' . $this->room); $this->executeIrcCommand($sock, 'PRIVMSG ' . $this->room . ' :' . $msg); - fclose($sock); + \fclose($sock); return true; } @@ -87,22 +87,22 @@ public function execute() private function executeIrcCommands($socket, array $commands) { foreach ($commands as $command) { - fputs($socket, $command . "\n"); + \fputs($socket, $command . "\n"); } $pingBack = false; // almost all servers expect pingback! - while ($response = fgets($socket)) { + while ($response = \fgets($socket)) { $matches = []; - if (preg_match('/^PING \\:([A-Z0-9]+)/', $response, $matches)) { + if (\preg_match('/^PING \\:([A-Z0-9]+)/', $response, $matches)) { $pingBack = $matches[1]; } } if ($pingBack) { $command = 'PONG :' . $pingBack . "\n"; - fputs($socket, $command); + \fputs($socket, $command); } } diff --git a/src/Plugin/Lint.php b/src/Plugin/Lint.php index cce328af2..ef5e97c4e 100644 --- a/src/Plugin/Lint.php +++ b/src/Plugin/Lint.php @@ -37,20 +37,20 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->directory, ]; - if (!empty($options['directories']) && is_array($options['directories'])) { + if (!empty($options['directories']) && \is_array($options['directories'])) { foreach ($options['directories'] as $index => $directory) { - $relativePath = preg_replace( + $relativePath = \preg_replace( '#^(\./|/)?(.*)$#', '$2', $options['directories'][$index] ); - $relativePath = rtrim($relativePath, "\//"); + $relativePath = \rtrim($relativePath, "\//"); $this->directories[] = $this->builder->buildPath . $relativePath . '/'; } } - if (array_key_exists('recursive', $options)) { + if (\array_key_exists('recursive', $options)) { $this->recursive = $options['recursive']; } } @@ -113,7 +113,7 @@ protected function lintDirectory($php, $path) $itemPath = $path . $item->getFilename(); - if (in_array($itemPath, $this->ignore)) { + if (\in_array($itemPath, $this->ignore)) { continue; } diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 8d599bc44..2383fedd0 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -74,40 +74,40 @@ public function execute() protected function getMageLog() { $logsDir = $this->build->getBuildPath() . '/.mage/logs'; - if (!is_dir($logsDir)) { + if (!\is_dir($logsDir)) { throw new RuntimeException('Log directory not found'); } - $list = scandir($logsDir); + $list = \scandir($logsDir); if ($list === false) { throw new RuntimeException('Log dir read fail'); } - $list = array_filter($list, function ($name) { - return preg_match('/^log-\d+-\d+\.log$/', $name); + $list = \array_filter($list, function ($name) { + return \preg_match('/^log-\d+-\d+\.log$/', $name); }); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } - $res = sort($list); + $res = \sort($list); if ($res === false) { throw new RuntimeException('Logs sort fail'); } - $lastLogFile = end($list); + $lastLogFile = \end($list); if ($lastLogFile === false) { throw new RuntimeException('Get last Log name fail'); } - $logContent = file_get_contents($logsDir . '/' . $lastLogFile); + $logContent = \file_get_contents($logsDir . '/' . $lastLogFile); if ($logContent === false) { throw new RuntimeException('Get last Log content fail'); } - $lines = explode("\n", $logContent); - $lines = array_map('trim', $lines); + $lines = \explode("\n", $logContent); + $lines = \array_map('trim', $lines); - return array_filter($lines); + return \array_filter($lines); } } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index f18101b8c..d6d38dc41 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -79,40 +79,40 @@ public function execute() protected function getMageLog() { $logsDir = $this->build->getBuildPath() . (!empty($this->mageLogDir) ? '/' . $this->mageLogDir : ''); - if (!is_dir($logsDir)) { + if (!\is_dir($logsDir)) { throw new RuntimeException('Log directory not found'); } - $list = scandir($logsDir); + $list = \scandir($logsDir); if ($list === false) { throw new RuntimeException('Log dir read fail'); } - $list = array_filter($list, function ($name) { - return preg_match('/^\d+_\d+\.log$/', $name); + $list = \array_filter($list, function ($name) { + return \preg_match('/^\d+_\d+\.log$/', $name); }); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } - $res = sort($list); + $res = \sort($list); if ($res === false) { throw new RuntimeException('Logs sort fail'); } - $lastLogFile = end($list); + $lastLogFile = \end($list); if ($lastLogFile === false) { throw new RuntimeException('Get last Log name fail'); } - $logContent = file_get_contents($logsDir . '/' . $lastLogFile); + $logContent = \file_get_contents($logsDir . '/' . $lastLogFile); if ($logContent === false) { throw new RuntimeException('Get last Log content fail'); } - $lines = explode("\n", $logContent); - $lines = array_map('trim', $lines); + $lines = \explode("\n", $logContent); + $lines = \array_map('trim', $lines); - return array_filter($lines); + return \array_filter($lines); } } diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 25c30b09f..8c79eb741 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -170,8 +170,8 @@ protected function executeFile(array $query) } $importFile = $this->builder->buildPath . $this->builder->interpolate($query['file']); - if (!is_readable($importFile)) { - throw new RuntimeException(sprintf('Cannot open SQL import file: %s', $importFile)); + if (!\is_readable($importFile)) { + throw new RuntimeException(\sprintf('Cannot open SQL import file: %s', $importFile)); } $database = isset($query['database']) ? $this->builder->interpolate($query['database']) : null; @@ -199,19 +199,19 @@ protected function getImportCommand($importFile, $database = null) 'gz' => '| gzip --decompress', ]; - $extension = strtolower(pathinfo($importFile, PATHINFO_EXTENSION)); + $extension = \strtolower(\pathinfo($importFile, PATHINFO_EXTENSION)); $decompressionCmd = ''; - if (array_key_exists($extension, $decompression)) { + if (\array_key_exists($extension, $decompression)) { $decompressionCmd = $decompression[$extension]; } $args = [ - ':import_file' => escapeshellarg($importFile), + ':import_file' => \escapeshellarg($importFile), ':decomp_cmd' => $decompressionCmd, - ':host' => escapeshellarg($this->host), - ':user' => escapeshellarg($this->user), - ':pass' => (!$this->password) ? '' : '-p' . escapeshellarg($this->password), - ':database' => ($database === null)? '': escapeshellarg($database), + ':host' => \escapeshellarg($this->host), + ':user' => \escapeshellarg($this->user), + ':pass' => (!$this->password) ? '' : '-p' . \escapeshellarg($this->password), + ':database' => ($database === null)? '': \escapeshellarg($database), ]; return strtr('cat :import_file :decomp_cmd | mysql -h:host -u:user :pass :database', $args); diff --git a/src/Plugin/Option/PhpUnitOptions.php b/src/Plugin/Option/PhpUnitOptions.php index 30babfeb6..be7ebe43f 100644 --- a/src/Plugin/Option/PhpUnitOptions.php +++ b/src/Plugin/Option/PhpUnitOptions.php @@ -55,7 +55,7 @@ public function buildArgumentString() foreach ($this->getCommandArguments() as $argumentName => $argumentValues) { $prefix = $argumentName[0] == '-' ? '' : '--'; - if (!is_array($argumentValues)) { + if (!\is_array($argumentValues)) { $argumentValues = [$argumentValues]; } @@ -97,15 +97,15 @@ private function parseArguments() */ if (isset($this->options['args'])) { $rawArgs = $this->options['args']; - if (is_array($rawArgs)) { + if (\is_array($rawArgs)) { $this->arguments = $rawArgs; } else { /* * Try to parse old arguments in a single string */ - preg_match_all('@--([a-z\-]+)([\s=]+)?[\'"]?((?!--)[-\w/.,\\\]+)?[\'"]?@', (string)$rawArgs, $argsMatch); + \preg_match_all('@--([a-z\-]+)([\s=]+)?[\'"]?((?!--)[-\w/.,\\\]+)?[\'"]?@', (string)$rawArgs, $argsMatch); - if (!empty($argsMatch) && sizeof($argsMatch) > 2) { + if (!empty($argsMatch) && \sizeof($argsMatch) > 2) { foreach ($argsMatch[1] as $index => $argName) { $this->addArgument($argName, $argsMatch[3][$index]); } @@ -149,7 +149,7 @@ private function parseArguments() public function addArgument($argumentName, $argumentValue = null) { if (isset($this->arguments[$argumentName])) { - if (!is_array($this->arguments[$argumentName])) { + if (!\is_array($this->arguments[$argumentName])) { // Convert existing argument values into an array $this->arguments[$argumentName] = [$this->arguments[$argumentName]]; } @@ -171,15 +171,15 @@ public function getDirectories() { $directories = $this->getOption('directories'); - if (is_string($directories)) { + if (\is_string($directories)) { $directories = [$directories]; } else { - if (is_null($directories)) { + if (\is_null($directories)) { $directories = []; } } - return is_array($directories) ? $directories : [$directories]; + return \is_array($directories) ? $directories : [$directories]; } /** @@ -250,7 +250,7 @@ public function getArgument($argumentName) $this->parseArguments(); if (isset($this->arguments[$argumentName])) { - return is_array( + return \is_array( $this->arguments[$argumentName] ) ? $this->arguments[$argumentName] : [$this->arguments[$argumentName]]; } @@ -277,7 +277,7 @@ public static function findConfigFile($buildPath) ]; foreach ($files as $file) { - if (file_exists($buildPath . $file)) { + if (\file_exists($buildPath . $file)) { return $file; } } diff --git a/src/Plugin/PackageBuild.php b/src/Plugin/PackageBuild.php index 4d9ced319..0fdd586a9 100644 --- a/src/Plugin/PackageBuild.php +++ b/src/Plugin/PackageBuild.php @@ -46,9 +46,9 @@ public function execute() return false; } - $filename = preg_replace('/([^a-zA-Z0-9_-]+)/', '', $this->filename); + $filename = \preg_replace('/([^a-zA-Z0-9_-]+)/', '', $this->filename); - if (!is_array($this->format)) { + if (!\is_array($this->format)) { $this->format = [$this->format]; } diff --git a/src/Plugin/Pahout.php b/src/Plugin/Pahout.php index 0e682dd52..999f28ec2 100644 --- a/src/Plugin/Pahout.php +++ b/src/Plugin/Pahout.php @@ -38,13 +38,13 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['pahout', 'pahout.phar']); - if (!empty($options['directory']) && is_string($options['directory'])) { + if (!empty($options['directory']) && \is_string($options['directory'])) { $this->directory = $options['directory']; } else { $this->directory = './src'; } - if (isset($options['allowed_warnings']) && is_int($options['allowed_warnings'])) { + if (isset($options['allowed_warnings']) && \is_int($options['allowed_warnings'])) { $this->allowedWarnings = $options['allowed_warnings']; } else { $this->allowedWarnings = -1; @@ -74,8 +74,8 @@ public function execute() list($files, $hints) = $this->processReport($this->builder->getLastOutput()); - if (0 < count($hints)) { - if (-1 !== $this->allowedWarnings && count($hints) > $this->allowedWarnings) { + if (0 < \count($hints)) { + if (-1 !== $this->allowedWarnings && \count($hints) > $this->allowedWarnings) { $success = false; } @@ -97,7 +97,7 @@ public function execute() $this->builder->logSuccess('Awesome! There is nothing from me to teach you!'); } - $this->builder->log(sprintf('%d files checked, %d hints detected.', count($files), count($hints))); + $this->builder->log(\sprintf('%d files checked, %d hints detected.', \count($files), \count($hints))); return $success; } @@ -126,17 +126,17 @@ public static function canExecuteOnStage($stage, Build $build) */ protected function processReport($output) { - $data = json_decode(trim($output), true); + $data = \json_decode(\trim($output), true); $hints = []; $files = []; - if (!empty($data) && is_array($data) && isset($data['hints'])) { + if (!empty($data) && \is_array($data) && isset($data['hints'])) { $files = $data['files']; foreach ($data['hints'] as $hint) { $hints[] = [ - 'full_message' => vsprintf('%s:%d' . PHP_EOL . self::TAB . '%s: %s [%s]', [ + 'full_message' => \vsprintf('%s:%d' . PHP_EOL . self::TAB . '%s: %s [%s]', [ $hint['filename'], $hint['lineno'], $hint['type'], diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index 116fcf191..c323f30d1 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -93,11 +93,11 @@ public function execute() $fileSystem = new Filesystem(); if (!$fileSystem->exists($this->buildLocation)) { - $fileSystem->mkdir($this->buildLocation, (0777 & ~umask())); + $fileSystem->mkdir($this->buildLocation, (0777 & ~\umask())); } - if (!is_writable($this->buildLocation)) { - throw new RuntimeException(sprintf( + if (!\is_writable($this->buildLocation)) { + throw new RuntimeException(\sprintf( 'The location %s is not writable or does not exist.', $this->buildLocation )); @@ -107,8 +107,8 @@ public function execute() $cmd = 'cd "%s" && ' . $pdepend . ' --summary-xml="%s" --jdepend-chart="%s" --overview-pyramid="%s" %s "%s"'; $ignore = ''; - if (count($this->ignore)) { - $ignore = sprintf(' --ignore="%s"', implode(',', $this->ignore)); + if (\count($this->ignore)) { + $ignore = \sprintf(' --ignore="%s"', \implode(',', $this->ignore)); } $success = $this->builder->executeCommand( @@ -124,14 +124,14 @@ public function execute() if (!$allowPublicArtifacts) { $fileSystem->remove($this->buildLocation); } - if ($allowPublicArtifacts && file_exists($this->buildLocation)) { + if ($allowPublicArtifacts && \file_exists($this->buildLocation)) { $fileSystem->remove($this->buildBranchLocation); $fileSystem->mirror($this->buildLocation, $this->buildBranchLocation); } if ($allowPublicArtifacts && $success) { $this->builder->logSuccess( - sprintf( + \sprintf( "\nPdepend successful build report.\nYou can use report for this build for inclusion in the readme.md file:\n%s,\n![Chart](%s \"Pdepend Chart\") and\n![Pyramid](%s \"Pdepend Pyramid\")\n\nOr report for last build in the branch:\n%s,\n![Chart](%s \"Pdepend Chart\") and\n![Pyramid](%s \"Pdepend Pyramid\")\n", APP_URL . 'artifacts/pdepend/' . $this->buildDirectory . '/' . $this->summary, APP_URL . 'artifacts/pdepend/' . $this->buildDirectory . '/' . $this->chart, diff --git a/src/Plugin/Pgsql.php b/src/Plugin/Pgsql.php index 5d36fa503..2758c04b3 100644 --- a/src/Plugin/Pgsql.php +++ b/src/Plugin/Pgsql.php @@ -87,7 +87,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->user = $this->builder->interpolate($buildSettings['pgsql']['user']); } - if (array_key_exists('password', $buildSettings['pgsql'])) { + if (\array_key_exists('password', $buildSettings['pgsql'])) { $this->password = $this->builder->interpolate($buildSettings['pgsql']['password']); } @@ -103,10 +103,10 @@ public function __construct(Builder $builder, Build $build, array $options = []) public function execute() { try { - $pdoOptions = array_merge([ + $pdoOptions = \array_merge([ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION ], $this->pdoOptions); - $dsn = sprintf('pgsql:host=%s;port=%s', $this->host, $this->port); + $dsn = \sprintf('pgsql:host=%s;port=%s', $this->host, $this->port); if (null !== $this->dbName) { $dsn .= ';dbname=' . $this->dbName; diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index 14a95bb6c..aece52d7d 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -55,12 +55,12 @@ public function __construct(Builder $builder, Build $build, array $options = []) */ public function execute() { - if (!file_exists($this->location)) { - mkdir($this->location, (0777 & ~umask()), true); + if (!\file_exists($this->location)) { + \mkdir($this->location, (0777 & ~\umask()), true); } - if (!is_writable($this->location)) { - throw new RuntimeException(sprintf('The location %s is not writable or does not exist.', $this->location)); + if (!\is_writable($this->location)) { + throw new RuntimeException(\sprintf('The location %s is not writable or does not exist.', $this->location)); } // Find PHP files in a file @@ -81,7 +81,7 @@ public function execute() $this->builder->executeCommand($cmd, $this->location . '/phan.in', $this->location . '/phan.out'); - $warningCount = $this->processReport(file_get_contents($this->location . '/phan.out')); + $warningCount = $this->processReport(\file_get_contents($this->location . '/phan.out')); $this->build->storeMeta((self::pluginName() . '-warnings'), $warningCount); @@ -105,9 +105,9 @@ public function execute() */ protected function processReport($jsonString) { - $json = json_decode($jsonString, true); + $json = \json_decode($jsonString, true); - if ($json === false || !is_array($json)) { + if ($json === false || !\is_array($json)) { $this->builder->log($jsonString); throw new RuntimeException('Could not process the report generated by Phan.'); } diff --git a/src/Plugin/Phar.php b/src/Plugin/Phar.php index 7c200460f..11a729158 100644 --- a/src/Plugin/Phar.php +++ b/src/Plugin/Phar.php @@ -143,7 +143,7 @@ public function getStubContent() $content = ''; $filename = $this->getStub(); if ($filename) { - $content = file_get_contents($this->builder->buildPath . $this->getStub()); + $content = \file_get_contents($this->builder->buildPath . $this->getStub()); } return $content; } diff --git a/src/Plugin/Phing.php b/src/Plugin/Phing.php index f51c2deb4..dc987940e 100644 --- a/src/Plugin/Phing.php +++ b/src/Plugin/Phing.php @@ -76,7 +76,7 @@ public function execute() $cmd[] = $this->targetsToString(); $cmd[] = '2>&1'; - return $this->builder->executeCommand(implode(' ', $cmd), $this->directory, $this->targets); + return $this->builder->executeCommand(\implode(' ', $cmd), $this->directory, $this->targets); } /** @@ -93,7 +93,7 @@ public function getTargets() */ private function targetsToString() { - return implode(' ', $this->targets); + return \implode(' ', $this->targets); } /** @@ -126,7 +126,7 @@ public function getBuildFile() */ public function setBuildFile($buildFile) { - if (!file_exists($this->directory . $buildFile)) { + if (!\file_exists($this->directory . $buildFile)) { throw new RuntimeException('Specified build file does not exist.'); } @@ -169,7 +169,7 @@ public function propertiesToString() $propertiesString[] = '-D' . $name . '="' . $value . '"'; } - return implode(' ', $propertiesString); + return \implode(' ', $propertiesString); } /** @@ -202,7 +202,7 @@ public function getPropertyFile() */ public function setPropertyFile($propertyFile) { - if (!file_exists($this->directory . '/' . $propertyFile)) { + if (!\file_exists($this->directory . '/' . $propertyFile)) { throw new RuntimeException('Specified property file does not exist.'); } diff --git a/src/Plugin/Phlint.php b/src/Plugin/Phlint.php index de2fe7d36..3f015c33b 100644 --- a/src/Plugin/Phlint.php +++ b/src/Plugin/Phlint.php @@ -33,7 +33,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['phlint', 'phlint.phar']); - if (array_key_exists('allowed_errors', $options) && is_int($options['allowed_errors'])) { + if (\array_key_exists('allowed_errors', $options) && \is_int($options['allowed_errors'])) { $this->allowedErrors = $options['allowed_errors']; } } @@ -54,8 +54,8 @@ public function execute() $errors = $this->processReport($this->builder->getLastOutput()); - if (0 < count($errors)) { - if (-1 !== $this->allowedErrors && count($errors) > $this->allowedErrors) { + if (0 < \count($errors)) { + if (-1 !== $this->allowedErrors && \count($errors) > $this->allowedErrors) { $success = false; } @@ -88,19 +88,19 @@ public static function pluginName() */ protected function processReport($output) { - $data = explode(chr(226), preg_replace('#\\x1b[[][^A-Za-z\n]*[A-Za-z]#', '', trim($output))); - array_pop($data); - array_shift($data); + $data = \explode(\chr(226), \preg_replace('#\\x1b[[][^A-Za-z\n]*[A-Za-z]#', '', \trim($output))); + \array_pop($data); + \array_shift($data); $errors = []; - if (0 < count($data)) { + if (0 < \count($data)) { foreach ($data as $error) { - $error = explode(PHP_EOL, $error); - $header = substr(trim(array_shift($error)), 3); - $file = strstr(substr(strstr($header, 'in '), 3), ':', true); - $line = substr(strrchr($header, ':'), 1); - $message = ltrim($error[0]) . PHP_EOL . ltrim($error[1]); + $error = \explode(PHP_EOL, $error); + $header = \substr(\trim(\array_shift($error)), 3); + $file = \strstr(\substr(\strstr($header, 'in '), 3), ':', true); + $line = \substr(\strrchr($header, ':'), 1); + $message = \ltrim($error[0]) . PHP_EOL . \ltrim($error[1]); $errors[] = [ 'message' => $message, diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index 8cf783200..55052f15e 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -91,11 +91,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->allowedErrors = -1; } - if (!empty($options['allowed_errors']) && is_int($options['allowed_errors'])) { + if (!empty($options['allowed_errors']) && \is_int($options['allowed_errors'])) { $this->allowedErrors = $options['allowed_errors']; } - if (!empty($options['allowed_warnings']) && is_int($options['allowed_warnings'])) { + if (!empty($options['allowed_warnings']) && \is_int($options['allowed_warnings'])) { $this->allowedWarnings = $options['allowed_warnings']; } @@ -115,15 +115,15 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->standard = $options['standard']; } - if (isset($options['severity']) && is_int($options['severity'])) { + if (isset($options['severity']) && \is_int($options['severity'])) { $this->severity = $options['severity']; } - if (isset($options['error_severity']) && is_int($options['error_severity'])) { + if (isset($options['error_severity']) && \is_int($options['error_severity'])) { $this->errorSeverity = $options['error_severity']; } - if (isset($options['warning_severity']) && is_int($options['warning_severity'])) { + if (isset($options['warning_severity']) && \is_int($options['warning_severity'])) { $this->warningSeverity = $options['warning_severity']; } } @@ -195,20 +195,20 @@ public function execute() protected function getFlags() { $ignore = ''; - if (count($this->ignore)) { - $ignore = sprintf(' --ignore="%s"', implode(',', $this->ignore)); + if (\count($this->ignore)) { + $ignore = \sprintf(' --ignore="%s"', \implode(',', $this->ignore)); } $standardPath = $this->normalizePath($this->standard); - if (file_exists($standardPath)) { + if (\file_exists($standardPath)) { $standard = ' --standard=' . $standardPath; } else { $standard = ' --standard=' . $this->standard; } $suffixes = ''; - if (count($this->suffixes)) { - $suffixes = ' --extensions=' . implode(',', $this->suffixes); + if (\count($this->suffixes)) { + $suffixes = ' --extensions=' . \implode(',', $this->suffixes); } $severity = ''; @@ -237,9 +237,9 @@ protected function getFlags() */ protected function processReport($output) { - $data = json_decode(trim($output), true); + $data = \json_decode(\trim($output), true); - if (!is_array($data)) { + if (!\is_array($data)) { $this->builder->log($output); throw new RuntimeException('Could not process the report generated by PHP Code Sniffer.'); } @@ -248,7 +248,7 @@ protected function processReport($output) $warnings = $data['totals']['warnings']; foreach ($data['files'] as $fileName => $file) { - $fileName = str_replace($this->builder->buildPath, '', $fileName); + $fileName = \str_replace($this->builder->buildPath, '', $fileName); foreach ($file['messages'] as $message) { $this->build->reportError( diff --git a/src/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php index 9c0e7a118..b0cfb370a 100644 --- a/src/Plugin/PhpCpd.php +++ b/src/Plugin/PhpCpd.php @@ -117,7 +117,7 @@ protected function processReport($xmlString) foreach ($xml->duplication as $duplication) { foreach ($duplication->file as $file) { $fileName = (string)$file['path']; - $fileName = str_replace($this->builder->buildPath, '', $fileName); + $fileName = \str_replace($this->builder->buildPath, '', $fileName); $message = <<config) { foreach ($this->configs as $config) { - if (file_exists($this->builder->buildPath . $config)) { + if (\file_exists($this->builder->buildPath . $config)) { $this->config = true; $this->args .= ' --config=./' . $config; break; @@ -125,11 +125,11 @@ public function execute() $output = $this->builder->getLastOutput(); $matches = []; - if (preg_match('/(\d+\.\d+\.\d+)/', $output, $matches)) { + if (\preg_match('/(\d+\.\d+\.\d+)/', $output, $matches)) { $version = $matches[1]; // Appeared in PHP CS Fixer 2.8.0 // https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.12/CHANGELOG.md#changelog-for-v280 - $this->supportsUdiff = version_compare($version, '2.8.0', '>='); + $this->supportsUdiff = \version_compare($version, '2.8.0', '>='); } if ($this->errors) { @@ -171,9 +171,9 @@ public function execute() */ protected function processReport($output) { - $data = json_decode(trim($output), true); + $data = \json_decode(\trim($output), true); - if (!is_array($data)) { + if (!\is_array($data)) { $this->builder->log($output); throw new RuntimeException('Could not process the report generated by PHP CS Fixer.'); } @@ -228,7 +228,7 @@ protected function processReport($output) $this->build->reportError( $this->builder, self::pluginName(), - "PHP CS Fixer suggestion:\r\n```diff\r\n" . implode("\r\n", $chunkDiff) . "\r\n```", + "PHP CS Fixer suggestion:\r\n```diff\r\n" . \implode("\r\n", $chunkDiff) . "\r\n```", BuildError::SEVERITY_LOW, $filename, $firstModifiedLine @@ -240,7 +240,7 @@ protected function processReport($output) $this->build->reportError( $this->builder, self::pluginName(), - 'PHP CS Fixer failed fixers: ' . implode(', ', $appliedFixers), + 'PHP CS Fixer failed fixers: ' . \implode(', ', $appliedFixers), BuildError::SEVERITY_LOW, $filename ); diff --git a/src/Plugin/PhpDocblockChecker.php b/src/Plugin/PhpDocblockChecker.php index 0022f0e17..e9a4abeee 100644 --- a/src/Plugin/PhpDocblockChecker.php +++ b/src/Plugin/PhpDocblockChecker.php @@ -45,19 +45,19 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->allowedWarnings = -1; } - if (array_key_exists('skip_classes', $options)) { + if (\array_key_exists('skip_classes', $options)) { $this->skipClasses = true; } - if (array_key_exists('skip_methods', $options)) { + if (\array_key_exists('skip_methods', $options)) { $this->skipMethods = true; } - if (array_key_exists('skip_signatures', $options)) { + if (\array_key_exists('skip_signatures', $options)) { $this->skipSignatures = true; } - if (array_key_exists('allowed_warnings', $options)) { + if (\array_key_exists('allowed_warnings', $options)) { $this->allowedWarnings = (int)$options['allowed_warnings']; } @@ -89,8 +89,8 @@ public function execute() // Build ignore string: $ignore = ''; - if (is_array($this->ignore)) { - $ignore = sprintf(' --exclude="%s"', implode(',', $this->ignore)); + if (\is_array($this->ignore)) { + $ignore = \sprintf(' --exclude="%s"', \implode(',', $this->ignore)); } // Are we skipping any checks? @@ -122,11 +122,11 @@ public function execute() ); $this->builder->logExecOutput(true); - $output = json_decode($this->builder->getLastOutput(), true); + $output = \json_decode($this->builder->getLastOutput(), true); $errors = 0; - if ($output && is_array($output)) { - $errors = count($output); + if ($output && \is_array($output)) { + $errors = \count($output); $this->builder->logWarning("Number of error : " . $errors); $this->reportErrors($output); diff --git a/src/Plugin/PhpLoc.php b/src/Plugin/PhpLoc.php index 848fb323d..8a17687ad 100644 --- a/src/Plugin/PhpLoc.php +++ b/src/Plugin/PhpLoc.php @@ -51,13 +51,13 @@ public function __construct(Builder $builder, Build $build, array $options = []) public function execute() { $ignore = ''; - if (is_array($this->ignore)) { + if (\is_array($this->ignore)) { $map = function ($item) { - return sprintf(' --exclude="%s"', $item); + return \sprintf(' --exclude="%s"', $item); }; - $ignore = array_map($map, $this->ignore); - $ignore = implode('', $ignore); + $ignore = \array_map($map, $this->ignore); + $ignore = \implode('', $ignore); } $phploc = $this->executable; @@ -65,7 +65,7 @@ public function execute() $success = $this->builder->executeCommand('cd "%s" && php -d xdebug.mode=0 -d error_reporting=0 ' . $phploc . ' %s %s', $this->builder->buildPath, $ignore, $this->directory); $output = $this->builder->getLastOutput(); - if (preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) { + if (\preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) { $data = []; foreach ($matches[1] as $k => $v) { $data[$v] = (int)$matches[2][$k]; diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index 6ba258a78..785571644 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -53,7 +53,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->allowedWarnings = -1; } - if (array_key_exists('allowed_warnings', $options)) { + if (\array_key_exists('allowed_warnings', $options)) { $this->allowedWarnings = (int)$options['allowed_warnings']; } @@ -89,7 +89,7 @@ public function execute() $this->executePhpMd($phpmdBinaryPath); - $errorCount = $this->processReport(trim($this->builder->getLastOutput())); + $errorCount = $this->processReport(\trim($this->builder->getLastOutput())); $this->build->storeMeta((self::pluginName() . '-warnings'), $errorCount); return $this->wasLastExecSuccessful($errorCount); @@ -102,7 +102,7 @@ public function execute() */ protected function overrideSetting($options, $key) { - if (isset($options[$key]) && is_array($options[$key])) { + if (isset($options[$key]) && \is_array($options[$key])) { $this->{$key} = $options[$key]; } } @@ -129,7 +129,7 @@ protected function processReport($xmlString) foreach ($xml->file as $file) { $fileName = (string)$file['name']; - $fileName = str_replace($this->builder->buildPath, '', $fileName); + $fileName = \str_replace($this->builder->buildPath, '', $fileName); foreach ($file->violation as $violation) { $warnings++; @@ -155,13 +155,13 @@ protected function processReport($xmlString) */ protected function tryAndProcessRules() { - if (!empty($this->rules) && !is_array($this->rules)) { + if (!empty($this->rules) && !\is_array($this->rules)) { $this->builder->logFailure('The "rules" option must be an array.'); return false; } foreach ($this->rules as &$rule) { - if (strpos($rule, '/') !== false) { + if (\strpos($rule, '/') !== false) { $rule = $this->builder->buildPath . $rule; } } @@ -178,18 +178,18 @@ protected function executePhpMd($binaryPath) $cmd = 'cd "%s" && ' . $binaryPath . ' "%s" xml %s %s %s'; $ignore = ''; - if (is_array($this->ignore) && count($this->ignore) > 0) { + if (\is_array($this->ignore) && \count($this->ignore) > 0) { $ignoreArray = []; foreach ($this->ignore as $ignoreItem) { $ignoreArray[] = /*$this->builder->buildPath .*/ $ignoreItem; } - $ignore = sprintf(' --exclude "%s"', implode(',', $ignoreArray)); + $ignore = \sprintf(' --exclude "%s"', \implode(',', $ignoreArray)); } $suffixes = ''; - if (is_array($this->suffixes) && count($this->suffixes) > 0) { - $suffixes = ' --suffixes ' . implode(',', $this->suffixes); + if (\is_array($this->suffixes) && \count($this->suffixes) > 0) { + $suffixes = ' --suffixes ' . \implode(',', $this->suffixes); } if (!$this->build->isDebug()) { @@ -201,7 +201,7 @@ protected function executePhpMd($binaryPath) $cmd, $this->builder->buildPath, $this->directory, - implode(',', $this->rules), + \implode(',', $this->rules), $ignore, $suffixes ); diff --git a/src/Plugin/PhpParallelLint.php b/src/Plugin/PhpParallelLint.php index bb3aaa916..2c8ef1c2a 100644 --- a/src/Plugin/PhpParallelLint.php +++ b/src/Plugin/PhpParallelLint.php @@ -56,8 +56,8 @@ public function __construct(Builder $builder, Build $build, array $options = []) // Only use if this is a comma delimited list $pattern = '/^([a-z]+)(,\ *[a-z]*)*$/'; - if (preg_match($pattern, $options['extensions'])) { - $this->extensions = str_replace(' ', '', $options['extensions']); + if (\preg_match($pattern, $options['extensions'])) { + $this->extensions = \str_replace(' ', '', $options['extensions']); } } } @@ -95,8 +95,8 @@ public function execute() $output = $this->builder->getLastOutput(); $matches = []; - if (preg_match_all('/Parse error\:/', $output, $matches)) { - $this->build->storeMeta((self::pluginName() . '-errors'), count($matches[0])); + if (\preg_match_all('/Parse error\:/', $output, $matches)) { + $this->build->storeMeta((self::pluginName() . '-errors'), \count($matches[0])); } return $success; @@ -110,10 +110,10 @@ protected function getFlags() { $ignoreFlags = []; foreach ($this->ignore as $ignoreDir) { - $ignoreFlags[] = sprintf(' --exclude "%s"', $this->builder->buildPath . $ignoreDir); + $ignoreFlags[] = \sprintf(' --exclude "%s"', $this->builder->buildPath . $ignoreDir); } - $ignore = implode(' ', $ignoreFlags); + $ignore = \implode(' ', $ignoreFlags); return [$ignore]; } diff --git a/src/Plugin/PhpStan.php b/src/Plugin/PhpStan.php index bd0c9e063..54d93cd56 100644 --- a/src/Plugin/PhpStan.php +++ b/src/Plugin/PhpStan.php @@ -66,7 +66,7 @@ public function execute() $this->builder->executeCommand( 'cd "%s" && ' . $phpStan . ' analyze --error-format=json %s', $this->builder->buildPath, - implode(' ', $this->directories) + \implode(' ', $this->directories) ); $this->builder->logExecOutput(true); @@ -82,18 +82,18 @@ public function execute() foreach ($files as $file => $payload) { if (0 < $payload['errors']) { - $file = str_replace($this->build->getBuildPath(), '', $file); - $len = strlen($file); + $file = \str_replace($this->build->getBuildPath(), '', $file); + $len = \strlen($file); $out = ''; - $filename = (false !== strpos($file, ' (')) ? strstr($file, ' (', true) : $file; + $filename = (false !== \strpos($file, ' (')) ? \strstr($file, ' (', true) : $file; foreach ($payload['messages'] as $message) { - if (strlen($message['message']) > $len) { - $len = strlen($message['message']); + if (\strlen($message['message']) > $len) { + $len = \strlen($message['message']); } - $out .= vsprintf(' %d%s %s' . PHP_EOL, [ + $out .= \vsprintf(' %d%s %s' . PHP_EOL, [ $message['line'], - str_repeat(' ', 6 - strlen($message['line'])), + \str_repeat(' ', 6 - \strlen($message['line'])), $message['message'] ]); @@ -106,9 +106,9 @@ public function execute() $message['line'] ); } - $separator = str_repeat('-', 6) . ' ' . str_repeat('-', $len + 2) . PHP_EOL; + $separator = \str_repeat('-', 6) . ' ' . \str_repeat('-', $len + 2) . PHP_EOL; - $this->builder->logFailure(vsprintf('%s Line %s' . PHP_EOL . '%s', [ + $this->builder->logFailure(\vsprintf('%s Line %s' . PHP_EOL . '%s', [ $separator, $file, $separator . $out . $separator @@ -120,7 +120,7 @@ public function execute() if ($success) { $this->builder->logSuccess('[OK] No errors'); } else { - $this->builder->log(sprintf('[ERROR] Found %d errors', $total_errors)); + $this->builder->log(\sprintf('[ERROR] Found %d errors', $total_errors)); } return $success; @@ -151,12 +151,12 @@ public static function canExecuteOnStage($stage, Build $build) */ protected function processReport($output) { - $data = json_decode(trim($output), true); + $data = \json_decode(\trim($output), true); $totalErrors = 0; $files = []; - if (!empty($data) && is_array($data) && (0 < $data['totals']['file_errors'])) { + if (!empty($data) && \is_array($data) && (0 < $data['totals']['file_errors'])) { $totalErrors = $data['totals']['file_errors']; $files = $data['files']; } diff --git a/src/Plugin/PhpTalLint.php b/src/Plugin/PhpTalLint.php index 004e1ef76..11296741d 100644 --- a/src/Plugin/PhpTalLint.php +++ b/src/Plugin/PhpTalLint.php @@ -49,11 +49,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - if (!empty($options['allowed_errors']) && is_int($options['allowed_errors'])) { + if (!empty($options['allowed_errors']) && \is_int($options['allowed_errors'])) { $this->allowedErrors = $options['allowed_errors']; } - if (!empty($options['allowed_warnings']) && is_int($options['allowed_warnings'])) { + if (!empty($options['allowed_warnings']) && \is_int($options['allowed_warnings'])) { $this->allowedWarnings = $options['allowed_warnings']; } @@ -107,7 +107,7 @@ protected function lintItem($item, $itemPath) { $success = true; - if ($item->isFile() && in_array(strtolower($item->getExtension()), $this->suffixes)) { + if ($item->isFile() && \in_array(\strtolower($item->getExtension()), $this->suffixes)) { if (!$this->lintFile($itemPath)) { $success = false; } @@ -135,7 +135,7 @@ protected function lintDirectory($path) $itemPath = $path . $item->getFilename(); - if (in_array($itemPath, $this->ignore)) { + if (\in_array($itemPath, $this->ignore)) { continue; } @@ -166,8 +166,8 @@ protected function lintFile($path) $output = $this->builder->getLastOutput(); - if (preg_match('/Found (.+?) (error|warning)/i', $output, $matches)) { - $rows = explode(PHP_EOL, $output); + if (\preg_match('/Found (.+?) (error|warning)/i', $output, $matches)) { + $rows = \explode(PHP_EOL, $output); unset($rows[0]); unset($rows[1]); @@ -175,15 +175,15 @@ protected function lintFile($path) unset($rows[3]); foreach ($rows as $row) { - $name = basename($path); + $name = \basename($path); - $row = str_replace('(use -i to include your custom modifier functions)', '', $row); - $message = str_replace($name . ': ', '', $row); + $row = \str_replace('(use -i to include your custom modifier functions)', '', $row); + $message = \str_replace($name . ': ', '', $row); - $parts = explode(' (line ', $message); + $parts = \explode(' (line ', $message); - $message = trim($parts[0]); - $line = str_replace(')', '', $parts[1]); + $message = \trim($parts[0]); + $line = \str_replace(')', '', $parts[1]); $this->failedPaths[] = [ 'file' => $path, diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index bb6618997..7fea1f0c1 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -91,7 +91,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) */ public static function canExecuteOnStage($stage, Build $build) { - if (Build::STAGE_TEST === $stage && !is_null(PhpUnitOptions::findConfigFile($build->getBuildPath()))) { + if (Build::STAGE_TEST === $stage && !\is_null(PhpUnitOptions::findConfigFile($build->getBuildPath()))) { return true; } @@ -113,8 +113,8 @@ public function execute() } $cmd = $this->executable; - $lastLine = exec($cmd . ' --log-json . --version'); - if (false !== strpos($lastLine, '--log-json')) { + $lastLine = \exec($cmd . ' --log-json . --version'); + if (false !== \strpos($lastLine, '--log-json')) { $logFormat = 'junit'; // --log-json is not supported } else { $logFormat = 'json'; @@ -136,7 +136,7 @@ public function execute() } } - return !in_array(false, $success); + return !\in_array(false, $success); } /** @@ -163,7 +163,7 @@ protected function runConfig($directory, $configFile, $logFormat) $buildPath = $this->build->getBuildPath(); // Save the results into a log file - $logFile = tempnam(sys_get_temp_dir(), 'jlog_'); + $logFile = \tempnam(\sys_get_temp_dir(), 'jlog_'); $options->addArgument('log-' . $logFormat, $logFile); // Removes any current configurations files @@ -175,11 +175,11 @@ protected function runConfig($directory, $configFile, $logFormat) if ($options->getOption('coverage') && $allowPublicArtifacts) { if (!$fileSystem->exists($this->buildLocation)) { - $fileSystem->mkdir($this->buildLocation, (0777 & ~umask())); + $fileSystem->mkdir($this->buildLocation, (0777 & ~\umask())); } - if (!is_writable($this->buildLocation)) { - throw new RuntimeException(sprintf( + if (!\is_writable($this->buildLocation)) { + throw new RuntimeException(\sprintf( 'The location %s is not writable or does not exist.', $this->buildLocation )); @@ -209,7 +209,7 @@ protected function runConfig($directory, $configFile, $logFormat) if ($covHtmlOk) { $this->builder->logSuccess( - sprintf( + \sprintf( "\nPHPUnit successful build coverage report.\nYou can use coverage report for this build: %s\nOr coverage report for last build in the branch: %s", APP_URL . 'artifacts/phpunit/' . $this->buildDirectory . '/index.html', APP_URL . 'artifacts/phpunit/' . $this->buildBranchDirectory . '/index.html' @@ -217,7 +217,7 @@ protected function runConfig($directory, $configFile, $logFormat) ); } elseif ($allowPublicArtifacts) { $this->builder->logFailure( - sprintf( + \sprintf( "\nPHPUnit could not build coverage report.\nmissing: %s\nlast of this branch: %s", APP_URL . 'artifacts/phpunit/' . $this->buildDirectory . '/index.html', APP_URL . 'artifacts/phpunit/' . $this->buildBranchDirectory . '/index.html' @@ -240,7 +240,7 @@ protected function runConfig($directory, $configFile, $logFormat) */ protected function extractCoverage($output) { - preg_match( + \preg_match( '#Classes:[\s]*(.*?)%[^M]*?Methods:[\s]*(.*?)%[^L]*?Lines:[\s]*(.*?)\%#s', $output, $matches @@ -275,8 +275,8 @@ protected function executePhpUnitCommand($cmd, $arguments, $directory) protected function checkRequiredCoverage($coverage) { foreach ($coverage as $key => $currentValue) { - if ($requiredValue = $this->options->getOption(implode('_', ['required', $key, 'coverage']))) { - if (bccomp($requiredValue, $currentValue) === 1) { + if ($requiredValue = $this->options->getOption(\implode('_', ['required', $key, 'coverage']))) { + if (\bccomp($requiredValue, $currentValue) === 1) { return false; } } @@ -295,7 +295,7 @@ protected function checkRequiredCoverage($coverage) */ protected function processResults($logFile, $logFormat) { - if (file_exists($logFile)) { + if (\file_exists($logFile)) { if ('json' === $logFormat) { $parser = new PhpUnitResultJson($logFile, $this->build->getBuildPath()); } else { @@ -319,7 +319,7 @@ protected function processResults($logFile, $logFormat) $error['line'] ); } - unlink($logFile); + \unlink($logFile); } else { throw new RuntimeException('log output file does not exist: ' . $logFile); } diff --git a/src/Plugin/Psalm.php b/src/Plugin/Psalm.php index ad23e29c9..25b9dc452 100644 --- a/src/Plugin/Psalm.php +++ b/src/Plugin/Psalm.php @@ -33,13 +33,13 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['psalm', 'psalm.phar']); - if (isset($options['allowed_errors']) && is_int($options['allowed_errors'])) { + if (isset($options['allowed_errors']) && \is_int($options['allowed_errors'])) { $this->allowedErrors = $options['allowed_errors']; } else { $this->allowedErrors = 0; } - if (isset($options['allowed_warnings']) && is_int($options['allowed_warnings'])) { + if (isset($options['allowed_warnings']) && \is_int($options['allowed_warnings'])) { $this->allowedWarnings = $options['allowed_warnings']; } else { $this->allowedWarnings = 0; @@ -65,8 +65,8 @@ public function execute() list($errors, $infos) = $this->processReport($this->builder->getLastOutput()); - if (0 < count($errors)) { - if (-1 !== $this->allowedErrors && count($errors) > $this->allowedErrors) { + if (0 < \count($errors)) { + if (-1 !== $this->allowedErrors && \count($errors) > $this->allowedErrors) { $success = false; } @@ -85,8 +85,8 @@ public function execute() } } - if (0 < count($infos)) { - if (-1 !== $this->allowedWarnings && count($infos) > $this->allowedWarnings) { + if (0 < \count($infos)) { + if (-1 !== $this->allowedWarnings && \count($infos) > $this->allowedWarnings) { $success = false; } @@ -126,19 +126,19 @@ public static function pluginName() */ protected function processReport($output) { - $data = json_decode(trim($output), true); + $data = \json_decode(\trim($output), true); $errors = []; $infos = []; - if (!empty($data) && is_array($data)) { + if (!empty($data) && \is_array($data)) { foreach ($data as $value) { - if (!in_array($value['severity'], ['error','info'])) { + if (!\in_array($value['severity'], ['error','info'])) { continue; } ${$value['severity'].'s'}[] = [ - 'full_message' => vsprintf('%s - %s:%d:%d - %s' . PHP_EOL . '%s', [ + 'full_message' => \vsprintf('%s - %s:%d:%d - %s' . PHP_EOL . '%s', [ $value['type'], $value['file_name'], $value['line_from'], diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index dc31ad496..35578fc52 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -75,7 +75,7 @@ public static function canExecuteOnStage($stage, Build $build) { $path = $build->getBuildPath() . 'composer.lock'; - if (file_exists($path) && $stage === Build::STAGE_TEST) { + if (\file_exists($path) && $stage === Build::STAGE_TEST) { return true; } diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index e27fce86a..65019a363 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -52,11 +52,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) parent::__construct($builder, $build, $options); $this->allowedWarnings = 0; - if (array_key_exists('allowed_warnings', $options)) { + if (\array_key_exists('allowed_warnings', $options)) { $this->allowedWarnings = (int)$options['allowed_warnings']; } - if (array_key_exists('user_uuid', $options)) { + if (\array_key_exists('user_uuid', $options)) { $this->userUuid = $options['user_uuid']; } @@ -64,7 +64,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->authToken = $options['auth_token']; } - if (array_key_exists('project_uuid', $options)) { + if (\array_key_exists('project_uuid', $options)) { $this->projectUuid = $options['project_uuid']; } @@ -82,7 +82,7 @@ public function execute() $this->executeSensiolabsInsight($insightBinaryPath); - $errorCount = $this->processReport(trim($this->builder->getLastOutput())); + $errorCount = $this->processReport(\trim($this->builder->getLastOutput())); $this->build->storeMeta((self::pluginName() . '-warnings'), $errorCount); return $this->wasLastExecSuccessful($errorCount); @@ -110,7 +110,7 @@ protected function processReport($xmlString) foreach ($xml->file as $file) { $fileName = (string)$file['name']; - $fileName = str_replace($this->builder->buildPath, '', $fileName); + $fileName = \str_replace($this->builder->buildPath, '', $fileName); foreach ($file->violation as $violation) { $warnings++; diff --git a/src/Plugin/Shell.php b/src/Plugin/Shell.php index 22e4cedad..2a8fe6c94 100644 --- a/src/Plugin/Shell.php +++ b/src/Plugin/Shell.php @@ -35,11 +35,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - if (array_key_exists('execute_all', $options) && $options['execute_all']) { + if (\array_key_exists('execute_all', $options) && $options['execute_all']) { $this->executeAll = true; } - if (isset($options['commands']) && is_array($options['commands'])) { + if (isset($options['commands']) && \is_array($options['commands'])) { $this->commands = $options['commands']; return; diff --git a/src/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php index f18802151..fc7511e87 100644 --- a/src/Plugin/SlackNotify.php +++ b/src/Plugin/SlackNotify.php @@ -39,8 +39,8 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - if (is_array($options) && isset($options['webhook_url'])) { - $this->webHook = trim($options['webhook_url']); + if (\is_array($options) && isset($options['webhook_url'])) { + $this->webHook = \trim($options['webhook_url']); if (isset($options['message'])) { $this->message = $options['message']; diff --git a/src/Plugin/Sqlite.php b/src/Plugin/Sqlite.php index aa41ae794..a9730a2f9 100644 --- a/src/Plugin/Sqlite.php +++ b/src/Plugin/Sqlite.php @@ -72,7 +72,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) public function execute() { try { - $pdoOptions = array_merge([ + $pdoOptions = \array_merge([ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION ], $this->pdoOptions); diff --git a/src/Plugin/TechnicalDebt.php b/src/Plugin/TechnicalDebt.php index 09c32eff8..230310906 100644 --- a/src/Plugin/TechnicalDebt.php +++ b/src/Plugin/TechnicalDebt.php @@ -96,10 +96,10 @@ protected function returnResult() $string = ''; $fileNumber = 0; foreach ($this->errorPerFile as $oneLine) { - $fileNumber += strlen($oneLine); - $string .= str_pad($oneLine, 60, ' ', STR_PAD_RIGHT); - $string .= str_pad($fileNumber, 4, ' ', STR_PAD_LEFT); - $string .= "/" . $this->numberOfAnalysedFile . " (" . floor($fileNumber * 100 / $this->numberOfAnalysedFile) . " %)\n"; + $fileNumber += \strlen($oneLine); + $string .= \str_pad($oneLine, 60, ' ', STR_PAD_RIGHT); + $string .= \str_pad($fileNumber, 4, ' ', STR_PAD_LEFT); + $string .= "/" . $this->numberOfAnalysedFile . " (" . \floor($fileNumber * 100 / $this->numberOfAnalysedFile) . " %)\n"; } $string .= "Checked {$fileNumber} files\n"; @@ -117,11 +117,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->allowedErrors = 0; $this->searches = ['TODO', 'FIXME', 'TO DO', 'FIX ME']; - if (!empty($options['suffixes']) && is_array($options['suffixes'])) { + if (!empty($options['suffixes']) && \is_array($options['suffixes'])) { $this->suffixes = $options['suffixes']; } - if (!empty($options['searches']) && is_array($options['searches'])) { + if (!empty($options['searches']) && \is_array($options['searches'])) { $this->searches = $options['searches']; } @@ -129,7 +129,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->allowedErrors = -1; } - if (array_key_exists('allowed_errors', $options) && $options['allowed_errors']) { + if (\array_key_exists('allowed_errors', $options) && $options['allowed_errors']) { $this->allowedErrors = (int)$options['allowed_errors']; } } @@ -154,7 +154,7 @@ public function execute() $success = true; $errorCount = $this->getErrorList(); - $this->builder->log($this->returnResult() . "Found $errorCount instances of " . implode(', ', $this->searches)); + $this->builder->log($this->returnResult() . "Found $errorCount instances of " . \implode(', ', $this->searches)); $this->build->storeMeta((self::pluginName() . '-warnings'), $errorCount); @@ -175,7 +175,7 @@ protected function getErrorList() $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->directory)); $this->builder->logDebug("Directory: " . $this->directory); - $this->builder->logDebug("Ignored path: ".json_encode($this->ignore, true)); + $this->builder->logDebug("Ignored path: " . \json_encode($this->ignore, true)); $errorCount = 0; /** @var SplFileInfo $file */ @@ -195,7 +195,7 @@ protected function getErrorList() $ignoreAbsolute = $this->builder->buildPath . $ignore; if ('/' === $ignoreAbsolute[0]) { - if (0 === strpos($filePath, $ignoreAbsolute)) { + if (0 === \strpos($filePath, $ignoreAbsolute)) { $ignored = true; break; } @@ -203,15 +203,15 @@ protected function getErrorList() } if (!$ignored) { - $handle = fopen($filePath, "r"); + $handle = \fopen($filePath, "r"); $lineNumber = 1; $errorInFile = false; - while (false === feof($handle)) { - $line = fgets($handle); + while (false === \feof($handle)) { + $line = \fgets($handle); foreach ($this->searches as $search) { - if ($technicalDebtLine = trim(strstr($line, $search))) { - $fileName = str_replace($this->directory, '', $filePath); + if ($technicalDebtLine = \trim(\strstr($line, $search))) { + $fileName = \str_replace($this->directory, '', $filePath); $this->build->reportError( $this->builder, @@ -228,7 +228,7 @@ protected function getErrorList() } $lineNumber++; } - fclose($handle); + \fclose($handle); if ($errorInFile === true) { $this->buildLogString('X'); diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index 5114ff873..c1d0594e8 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -64,9 +64,9 @@ public function __construct(Builder $builder, Build $build, array $options = []) } $this->recipients = []; - if (is_string($options['recipients'])) { + if (\is_string($options['recipients'])) { $this->recipients = [$options['recipients']]; - } elseif (is_array($options['recipients'])) { + } elseif (\is_array($options['recipients'])) { $this->recipients = $options['recipients']; } @@ -123,22 +123,22 @@ private function buildMessage() $this->buildMsg = ''; $buildIcon = $this->build->isSuccessful() ? '✅' : '❌'; $buildLog = $this->build->getLog(); - $buildLog = str_replace(['[0;32m', '[0;31m', '[0m', '/[0m'], '', $buildLog); - $buildMessages = explode('RUNNING PLUGIN: ', $buildLog); + $buildLog = \str_replace(['[0;32m', '[0;31m', '[0m', '/[0m'], '', $buildLog); + $buildMessages = \explode('RUNNING PLUGIN: ', $buildLog); foreach ($buildMessages as $bm) { - $pos = mb_strpos($bm, "\n"); - $firstRow = mb_substr($bm, 0, $pos); + $pos = \mb_strpos($bm, "\n"); + $firstRow = \mb_substr($bm, 0, $pos); //skip long outputs - if (in_array($firstRow, ['slack_notify', 'php_loc', 'telegram_notify'])) { + if (\in_array($firstRow, ['slack_notify', 'php_loc', 'telegram_notify'])) { continue; } $this->buildMsg .= '*RUNNING PLUGIN: ' . $firstRow . "*\n"; - $this->buildMsg .= $firstRow == 'composer' ? '' : ('```' . mb_substr($bm, $pos) . '```'); + $this->buildMsg .= $firstRow == 'composer' ? '' : ('```' . \mb_substr($bm, $pos) . '```'); } - return $this->builder->interpolate(str_replace(['%ICON_BUILD%'], [$buildIcon], $this->message)); + return $this->builder->interpolate(\str_replace(['%ICON_BUILD%'], [$buildIcon], $this->message)); } } diff --git a/src/Plugin/Util/BitbucketNotifyPluginResult.php b/src/Plugin/Util/BitbucketNotifyPluginResult.php index a03f532ab..0f1b5b419 100644 --- a/src/Plugin/Util/BitbucketNotifyPluginResult.php +++ b/src/Plugin/Util/BitbucketNotifyPluginResult.php @@ -76,9 +76,9 @@ public function isUnchanged() public function generateFormattedOutput($maxPluginNameLength) { - return trim(sprintf( + return \trim(\sprintf( $this->outputFormat, - str_pad($this->plugin, $maxPluginNameLength), + \str_pad($this->plugin, $maxPluginNameLength), $this->left, $this->right, $this->generateComment() @@ -91,7 +91,7 @@ public function generateTaskDescription() return ''; } - return sprintf( + return \sprintf( $this->getTaskDescriptionMessage(), $this->plugin, $this->left, diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index e457b7268..5be3dde5e 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -59,7 +59,7 @@ public function executePlugins($config, $stage) $pluginsToExecute = []; // If we have global plugins to execute for this stage, add them to the list to be executed: - if (array_key_exists($stage, $config) && is_array($config[$stage])) { + if (\array_key_exists($stage, $config) && \is_array($config[$stage])) { $pluginsToExecute[] = $config[$stage]; } @@ -82,17 +82,17 @@ public function executePlugins($config, $stage) */ public function getBranchSpecificConfig($config, $branch) { - $configSections = array_keys($config); + $configSections = \array_keys($config); foreach ($configSections as $configSection) { - if (0 === strpos($configSection, 'branch-')) { + if (0 === \strpos($configSection, 'branch-')) { if ($configSection === ('branch-' . $branch)) { return $config[$configSection]; } - if (0 === strpos($configSection, 'branch-regex:')) { - $pattern = '#' . substr($configSection, 13) . '#u'; - preg_match($pattern, $branch, $matches); + if (0 === \strpos($configSection, 'branch-regex:')) { + $pattern = '#' . \substr($configSection, 13) . '#u'; + \preg_match($pattern, $branch, $matches); if (!empty($matches[0])) { return $config[$configSection]; } @@ -137,13 +137,13 @@ protected function getBranchSpecificPlugins($config, $stage, $pluginsToExecute) // Run branch-specific plugins before standard plugins: case 'before': - array_unshift($pluginsToExecute, $plugins); + \array_unshift($pluginsToExecute, $plugins); break; // Run branch-specific plugins after standard plugins: case 'after': default: - array_push($pluginsToExecute, $plugins); + \array_push($pluginsToExecute, $plugins); break; } @@ -164,8 +164,8 @@ protected function doExecutePlugins($plugins, $stage) foreach ($plugins as $plugin => $options) { $this->logger->log(''); $this->logger->logSuccess( - sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' . - 'Stage' . ': ' . ucfirst($stage) . ')' + \sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' . + 'Stage' . ': ' . \ucfirst($stage) . ')' ); $this->setPluginStatus($stage, $plugin, Plugin::STATUS_RUNNING); @@ -212,13 +212,13 @@ protected function doExecutePlugins($plugins, $stage) public function executePlugin($plugin, $options) { $class = $plugin; - if (!class_exists($class)) { - $class = str_replace('_', ' ', $plugin); - $class = ucwords($class); - $class = 'PHPCensor\\Plugin\\' . str_replace(' ', '', $class); + if (!\class_exists($class)) { + $class = \str_replace('_', ' ', $plugin); + $class = \ucwords($class); + $class = 'PHPCensor\\Plugin\\' . \str_replace(' ', '', $class); - if (!class_exists($class)) { - $this->logger->logFailure(sprintf('Plugin does not exist: %s', $plugin)); + if (!\class_exists($class)) { + $this->logger->logFailure(\sprintf('Plugin does not exist: %s', $plugin)); return false; } @@ -226,7 +226,7 @@ public function executePlugin($plugin, $options) try { // Build and run it - $obj = $this->pluginFactory->buildPlugin($class, (is_null($options) ? [] : $options)); + $obj = $this->pluginFactory->buildPlugin($class, (\is_null($options) ? [] : $options)); $obj->setStoreRegistry($this->storeRegistry); return $obj->execute(); @@ -255,9 +255,9 @@ protected function setPluginStatus($stage, $plugin, $status) $summary[$stage][$plugin]['status'] = $status; if ($status === Plugin::STATUS_RUNNING) { - $summary[$stage][$plugin]['started'] = time(); + $summary[$stage][$plugin]['started'] = \time(); } elseif ($status >= Plugin::STATUS_SUCCESS) { - $summary[$stage][$plugin]['ended'] = time(); + $summary[$stage][$plugin]['ended'] = \time(); } $this->setBuildSummary($summary); @@ -284,6 +284,6 @@ private function getBuildSummary() private function setBuildSummary($summary) { $build = $this->pluginFactory->getBuild(); - $this->store->setMeta($build->getId(), 'plugin-summary', json_encode($summary)); + $this->store->setMeta($build->getId(), 'plugin-summary', \json_encode($summary)); } } diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index b28c8ed00..645ac0f9c 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -27,14 +27,14 @@ class PhpUnitResultJson extends PhpUnitResult */ public function parse() { - $rawResults = file_get_contents($this->outputFile); + $rawResults = \file_get_contents($this->outputFile); $events = []; if ($rawResults && $rawResults[0] == '{') { - $fixedJson = '[' . str_replace('}{', '},{', $rawResults) . ']'; - $events = json_decode($fixedJson, true); + $fixedJson = '[' . \str_replace('}{', '},{', $rawResults) . ']'; + $events = \json_decode($fixedJson, true); } elseif ($rawResults) { - $events = json_decode($rawResults, true); + $events = \json_decode($rawResults, true); } // Reset the parsing variables @@ -81,7 +81,7 @@ protected function getSeverity($event) $severity = self::SEVERITY_FAIL; break; case 'error': - if (strpos($event['message'], 'Skipped') === 0 || strpos($event['message'], 'Incomplete') === 0) { + if (\strpos($event['message'], 'Skipped') === 0 || \strpos($event['message'], 'Incomplete') === 0) { $severity = self::SEVERITY_SKIPPED; } else { $severity = self::SEVERITY_ERROR; @@ -130,7 +130,7 @@ protected function buildTrace($event) if (!empty($event['trace'])) { foreach ($event['trace'] as $step) { - $line = str_replace($this->buildPath, '', $step['file']) . ':' . $step['line']; + $line = \str_replace($this->buildPath, '', $step['file']) . ':' . $step['line']; $formattedTrace[] = $line; } } @@ -153,11 +153,11 @@ protected function getFileAndLine($event) 'line' => '', ]; } - $firstTrace = end($event['trace']); - reset($event['trace']); + $firstTrace = \end($event['trace']); + \reset($event['trace']); return [ - 'file' => str_replace($this->buildPath, '', $firstTrace['file']), + 'file' => \str_replace($this->buildPath, '', $firstTrace['file']), 'line' => $firstTrace['line'] ]; } diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index d633009c6..9dace242e 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -100,13 +100,13 @@ protected function getOutput($testCase) protected function buildTrace($testCase) { - if (!is_int($testCase['_tracePos'])) { + if (!\is_int($testCase['_tracePos'])) { $this->buildMessage($testCase); } if ($testCase['_tracePos'] >= 0) { - $stackStr = substr($this->getMessageTrace($testCase), (int)$testCase['_tracePos'] + 2, -1); - $trace = explode("\n", str_replace($this->buildPath, '.', $stackStr)); + $stackStr = \substr($this->getMessageTrace($testCase), (int)$testCase['_tracePos'] + 2, -1); + $trace = \explode("\n", \str_replace($this->buildPath, '.', $stackStr)); } else { $trace = array(); } @@ -140,7 +140,7 @@ private function getMessageTrace($testCase) */ private function loadResultFile() { - if (!file_exists($this->outputFile) || 0 === filesize($this->outputFile)) { + if (!\file_exists($this->outputFile) || 0 === \filesize($this->outputFile)) { $this->internalProblem('empty output file'); return new SimpleXMLElement(''); // new empty element diff --git a/src/Plugin/Util/TestResultParsers/Codeception.php b/src/Plugin/Util/TestResultParsers/Codeception.php index b563e62fe..f0ff92ad4 100644 --- a/src/Plugin/Util/TestResultParsers/Codeception.php +++ b/src/Plugin/Util/TestResultParsers/Codeception.php @@ -75,7 +75,7 @@ public function parse() foreach ($testSuite->testcase as $testCase) { $testResult = [ 'suite' => (string)$testSuite['name'], - 'file' => str_replace($this->builder->buildPath, '/', (string)$testCase['file']), + 'file' => \str_replace($this->builder->buildPath, '/', (string)$testCase['file']), 'name' => (string)$testCase['name'], 'feature' => (string)$testCase['feature'], 'assertions' => (int)$testCase['assertions'], @@ -88,7 +88,7 @@ public function parse() // PHPUnit testcases does not have feature field. Use class::method instead if (!$testResult['feature']) { - $testResult['feature'] = sprintf('%s::%s', $testResult['class'], $testResult['name']); + $testResult['feature'] = \sprintf('%s::%s', $testResult['class'], $testResult['name']); } if (isset($testCase->failure) || isset($testCase->error)) { diff --git a/src/Plugin/WebhookNotify.php b/src/Plugin/WebhookNotify.php index 560eba466..d4558ffd8 100644 --- a/src/Plugin/WebhookNotify.php +++ b/src/Plugin/WebhookNotify.php @@ -40,14 +40,14 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - if (!is_array($options)) { + if (!\is_array($options)) { throw new InvalidArgumentException('Please configure the options for the webhook_notify plugin!'); } if (!isset($options['url'])) { throw new InvalidArgumentException('Please define the url for webhook_notify plugin!'); } - $this->url = trim($options['url']); + $this->url = \trim($options['url']); } /** @@ -112,6 +112,6 @@ private function getReadableStatus($statusId) return 'Failed'; break; } - return sprintf('Unknown (%d)', $statusId); + return \sprintf('Unknown (%d)', $statusId); } } diff --git a/src/Plugin/Wipe.php b/src/Plugin/Wipe.php index fd7eaeec5..ba4593c1f 100644 --- a/src/Plugin/Wipe.php +++ b/src/Plugin/Wipe.php @@ -40,7 +40,7 @@ public function execute() return true; } - if (is_dir($this->directory)) { + if (\is_dir($this->directory)) { $cmd = 'rm -Rf "%s"'; return $this->builder->executeCommand($cmd, $this->directory); diff --git a/src/Plugin/XmppNotify.php b/src/Plugin/XmppNotify.php index 541c219ad..8da1bc229 100644 --- a/src/Plugin/XmppNotify.php +++ b/src/Plugin/XmppNotify.php @@ -78,9 +78,9 @@ public function __construct(Builder $builder, Build $build, array $options = []) * Set recipients list */ if (!empty($options['recipients'])) { - if (is_string($options['recipients'])) { + if (\is_string($options['recipients'])) { $this->recipients = [$options['recipients']]; - } elseif (is_array($options['recipients'])) { + } elseif (\is_array($options['recipients'])) { $this->recipients = $options['recipients']; } } @@ -112,9 +112,9 @@ protected function getConfigFormat() */ public function findConfigFile() { - if (file_exists($this->builder->buildPath . '.sendxmpprc')) { - if (md5(file_get_contents($this->builder->buildPath . '.sendxmpprc')) - !== md5($this->getConfigFormat())) { + if (\file_exists($this->builder->buildPath . '.sendxmpprc')) { + if (\md5(\file_get_contents($this->builder->buildPath . '.sendxmpprc')) + !== \md5($this->getConfigFormat())) { return null; } @@ -134,7 +134,7 @@ public function execute() /* * Without recipients we can't send notification */ - if (!is_array($this->recipients) || count($this->recipients) == 0) { + if (!\is_array($this->recipients) || \count($this->recipients) == 0) { return false; } @@ -142,9 +142,9 @@ public function execute() * Try to build conf file */ $configFile = $this->builder->buildPath . '.sendxmpprc'; - if (is_null($this->findConfigFile())) { - file_put_contents($configFile, $this->getConfigFormat()); - chmod($configFile, 0600); + if (\is_null($this->findConfigFile())) { + \file_put_contents($configFile, $this->getConfigFormat()); + \chmod($configFile, 0600); } /* @@ -164,7 +164,7 @@ public function execute() * Send XMPP notification for all recipients */ $cmd = $sendxmpp . "%s -f %s -m %s %s"; - $recipients = implode(' ', $this->recipients); + $recipients = \implode(' ', $this->recipients); $success = $this->builder->executeCommand($cmd, $tls, $configFile, $messageFile, $recipients); @@ -190,8 +190,8 @@ protected function buildMessage($messageFile) $message = "✘ [" . $this->build->getProjectTitle() . "] Build #" . $this->build->getId() . " failure"; } - $message .= ' (' . strftime($this->dateFormat) . ')'; + $message .= ' (' . \strftime($this->dateFormat) . ')'; - return file_put_contents($messageFile, $message); + return \file_put_contents($messageFile, $message); } } diff --git a/src/Security/Authentication/Service.php b/src/Security/Authentication/Service.php index ba2ae7489..7a4108fd9 100644 --- a/src/Security/Authentication/Service.php +++ b/src/Security/Authentication/Service.php @@ -49,8 +49,8 @@ public function __construct( public static function buildProvider(StoreRegistry $storeRegistry, string $key, array $config): UserProviderInterface { - $class = ucfirst($config['type']); - if (class_exists('\\PHPCensor\\Security\\Authentication\\UserProvider\\' . $class)) { + $class = \ucfirst($config['type']); + if (\class_exists('\\PHPCensor\\Security\\Authentication\\UserProvider\\' . $class)) { $class = '\\PHPCensor\\Security\\Authentication\\UserProvider\\' . $class; } diff --git a/src/Security/Authentication/UserProvider/Ldap.php b/src/Security/Authentication/UserProvider/Ldap.php index 9c30aa37d..2245d6b73 100644 --- a/src/Security/Authentication/UserProvider/Ldap.php +++ b/src/Security/Authentication/UserProvider/Ldap.php @@ -81,7 +81,7 @@ public function provisionUser(?string $identifier): ?User $user = $this->storeRegistry->get('User'); $userService = new UserService($this->storeRegistry, $user); - $parts = explode("@", $identifier); + $parts = \explode("@", $identifier); $username = $parts[0]; return $userService->createUser($username, $identifier, $this->key, $this->config, '', false); diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index f107710c2..6ce551e8a 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -87,7 +87,7 @@ public function createBuild( $build->setStatusPending(); $build->setEnvironmentid($environmentId); - if (!is_null($extra)) { + if (!\is_null($extra)) { $build->setExtra($extra); } @@ -145,14 +145,14 @@ public function createBuild( public function createPeriodicalBuilds(Logger $logger) { $periodicalConfig = null; - if (file_exists(APP_DIR . 'periodical.yml')) { + if (\file_exists(APP_DIR . 'periodical.yml')) { try { $periodicalConfig = (new Yaml())->parse( - file_get_contents(APP_DIR . 'periodical.yml') + \file_get_contents(APP_DIR . 'periodical.yml') ); } catch (ParseException $e) { $logger->error( - sprintf( + \sprintf( 'Invalid periodical builds config ("app/periodical.yml")! Exception: %s', $e->getMessage() ), @@ -165,7 +165,7 @@ public function createPeriodicalBuilds(Logger $logger) if (empty($periodicalConfig) || empty($periodicalConfig['projects']) || - !is_array($periodicalConfig['projects'])) { + !\is_array($periodicalConfig['projects'])) { $logger->warning('Empty periodical builds config ("app/periodical.yml")!'); return; @@ -178,9 +178,9 @@ public function createPeriodicalBuilds(Logger $logger) if (!$project || empty($projectConfig['interval']) || empty($projectConfig['branches']) || - !is_array($projectConfig['branches'])) { + !\is_array($projectConfig['branches'])) { $logger->warning( - sprintf( + \sprintf( 'Invalid/empty section for project #%s ("app/periodical.yml")!', $projectId ) @@ -195,7 +195,7 @@ public function createPeriodicalBuilds(Logger $logger) $interval = new DateInterval($projectConfig['interval']); } catch (Exception $e) { $logger->error( - sprintf( + \sprintf( 'Invalid datetime interval for project #%s! Exception: %s', $projectId, $e->getMessage() @@ -238,10 +238,10 @@ public function createPeriodicalBuilds(Logger $logger) } $logger->notice( - sprintf( + \sprintf( 'Created %d periodical builds for %d projects.', $buildsCount, - count($periodicalConfig['projects']) + \count($periodicalConfig['projects']) ) ); } @@ -322,9 +322,9 @@ public function deleteAllByProject($projectId) $fileSystem = new Filesystem(); foreach ($projectPaths as $projectPath) { - if (is_link($projectPath)) { + if (\is_link($projectPath)) { // Remove the symlink without using recursive. - exec(sprintf('rm "%s"', $projectPath)); + \exec(\sprintf('rm "%s"', $projectPath)); } else { $fileSystem->remove($projectPath); } @@ -385,7 +385,7 @@ public function addJobToQueue($jobType, array $jobData, $queuePriority = Pheanst $pheanstalk->useTube($settings['name']); $pheanstalk->put( - json_encode($jobData), + \json_encode($jobData), $queuePriority, PheanstalkInterface::DEFAULT_DELAY, $this->configuration->get('php-censor.queue.lifetime', 600) diff --git a/src/Service/BuildStatusService.php b/src/Service/BuildStatusService.php index d1a703776..58b9d79c9 100644 --- a/src/Service/BuildStatusService.php +++ b/src/Service/BuildStatusService.php @@ -49,7 +49,7 @@ public function __construct( if ($this->build) { $this->loadParentBuild($isParent); } - if (defined('APP_URL')) { + if (\defined('APP_URL')) { $this->setUrl(APP_URL); } } @@ -96,7 +96,7 @@ protected function loadParentBuild($isParent = true) */ public function getActivity() { - if (in_array($this->build->getStatus(), $this->finishedStatusIds)) { + if (\in_array($this->build->getStatus(), $this->finishedStatusIds)) { return 'Sleeping'; } elseif ($this->build->getStatus() == Build::STATUS_PENDING) { return 'Pending'; @@ -119,7 +119,7 @@ public function getName() */ public function isFinished() { - if (in_array($this->build->getStatus(), $this->finishedStatusIds)) { + if (\in_array($this->build->getStatus(), $this->finishedStatusIds)) { return true; } return false; diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index 227a61f14..40bb617fc 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -76,39 +76,39 @@ public function updateProject(Project $project, $title, $type, $reference, $opti $project->setOverwriteBuildConfig(true); // Handle extra project options: - if (array_key_exists('ssh_private_key', $options)) { + if (\array_key_exists('ssh_private_key', $options)) { $project->setSshPrivateKey($options['ssh_private_key']); } - if (array_key_exists('ssh_public_key', $options)) { + if (\array_key_exists('ssh_public_key', $options)) { $project->setSshPublicKey($options['ssh_public_key']); } - if (array_key_exists('overwrite_build_config', $options)) { + if (\array_key_exists('overwrite_build_config', $options)) { $project->setOverwriteBuildConfig($options['overwrite_build_config']); } - if (array_key_exists('build_config', $options)) { + if (\array_key_exists('build_config', $options)) { $project->setBuildConfig($options['build_config']); } - if (array_key_exists('allow_public_status', $options)) { + if (\array_key_exists('allow_public_status', $options)) { $project->setAllowPublicStatus($options['allow_public_status']); } - if (array_key_exists('archived', $options)) { + if (\array_key_exists('archived', $options)) { $project->setArchived($options['archived']); } - if (array_key_exists('default_branch', $options)) { + if (\array_key_exists('default_branch', $options)) { $project->setDefaultBranch($options['default_branch']); } - if (array_key_exists('default_branch_only', $options)) { + if (\array_key_exists('default_branch_only', $options)) { $project->setDefaultBranchOnly($options['default_branch_only']); } - if (array_key_exists('group', $options)) { + if (\array_key_exists('group', $options)) { $project->setGroupId((int)$options['group']); } else { $project->setGroupId(1); @@ -120,7 +120,7 @@ public function updateProject(Project $project, $title, $type, $reference, $opti /** @var Project $project */ $project = $this->projectStore->save($project); - if (array_key_exists('environments', $options)) { + if (\array_key_exists('environments', $options)) { $project->setEnvironments($options['environments']); } @@ -159,13 +159,13 @@ protected function processAccessInformation(Project $project) { $reference = $project->getReference(); - if (in_array($project->getType(), [ + if (\in_array($project->getType(), [ Project::TYPE_GITHUB, Project::TYPE_GITLAB ], true)) { $info = []; - if (preg_match( + if (\preg_match( '#^((https|http|ssh)://)?((.+)@)?(([^/:]+):?)(:?([0-9]*)/?)(.+)\.git#', $reference, $matches diff --git a/src/Service/UserService.php b/src/Service/UserService.php index 5d8f322d1..90b36d29e 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -74,10 +74,10 @@ public function updateUser(User $user, $name, $emailAddress, $password = null, $ $user->setEmail($emailAddress); if (!empty($password)) { - $user->setHash(password_hash($password, PASSWORD_DEFAULT)); + $user->setHash(\password_hash($password, PASSWORD_DEFAULT)); } - if (!is_null($isAdmin)) { + if (!\is_null($isAdmin)) { $user->setIsAdmin($isAdmin); } diff --git a/src/Store.php b/src/Store.php index d267b56ba..16ddd0efb 100644 --- a/src/Store.php +++ b/src/Store.php @@ -71,24 +71,24 @@ public function getWhere( foreach ($where as $key => $value) { $key = $this->fieldCheck($key); - if (!is_array($value)) { + if (!\is_array($value)) { $params[] = $value; $wheres[] = $key . ' = ?'; } } - if (count($wheres)) { - $query .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')'; - $countQuery .= ' WHERE (' . implode(' ' . $whereType . ' ', $wheres) . ')'; + if (\count($wheres)) { + $query .= ' WHERE (' . \implode(' ' . $whereType . ' ', $wheres) . ')'; + $countQuery .= ' WHERE (' . \implode(' ' . $whereType . ' ', $wheres) . ')'; } - if (count($order)) { + if (\count($order)) { $orders = []; foreach ($order as $key => $value) { $orders[] = $this->fieldCheck($key) . ' ' . $value; } - $query .= ' ORDER BY ' . implode(', ', $orders); + $query .= ' ORDER BY ' . \implode(', ', $orders); } if ($limit) { @@ -152,7 +152,7 @@ public function save(Model $obj, bool $saveAllColumns = false): ?Model public function saveByUpdate(Model $obj, bool $saveAllColumns = false): ?Model { $data = $obj->getDataArray(); - $modified = ($saveAllColumns) ? array_keys($data) : $obj->getModified(); + $modified = ($saveAllColumns) ? \array_keys($data) : $obj->getModified(); $updates = []; $updateParams = []; @@ -161,11 +161,11 @@ public function saveByUpdate(Model $obj, bool $saveAllColumns = false): ?Model $updateParams[] = [$key, $data[$key]]; } - if (count($updates)) { - $qs = sprintf( + if (\count($updates)) { + $qs = \sprintf( 'UPDATE {{%s}} SET %s WHERE {{%s}} = :primaryKey', $this->tableName, - implode(', ', $updates), + \implode(', ', $updates), $this->primaryKey ); $q = $this->databaseManager->getConnection('write')->prepare($qs); @@ -197,7 +197,7 @@ public function saveByInsert(Model $obj, bool $saveAllColumns = false): ?Model { $rtn = null; $data = $obj->getDataArray(); - $modified = ($saveAllColumns) ? array_keys($data) : $obj->getModified(); + $modified = ($saveAllColumns) ? \array_keys($data) : $obj->getModified(); $cols = []; $values = []; @@ -208,12 +208,12 @@ public function saveByInsert(Model $obj, bool $saveAllColumns = false): ?Model $qParams[':' . $key] = $data[$key]; } - if (count($cols)) { - $qs = sprintf( + if (\count($cols)) { + $qs = \sprintf( 'INSERT INTO {{%s}} (%s) VALUES (%s)', $this->tableName, - implode(', ', $cols), - implode(', ', $values) + \implode(', ', $cols), + \implode(', ', $values) ); $q = $this->databaseManager->getConnection('write')->prepare($qs); @@ -269,7 +269,7 @@ protected function fieldCheck(string $field): string throw new InvalidArgumentException('You cannot have an empty field name.'); } - if (strpos($field, '.') === false) { + if (\strpos($field, '.') === false) { return '{{' . $this->tableName . '}}.{{' . $field . '}}'; } diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index e624e2601..672d00519 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -49,7 +49,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildErr */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -82,7 +82,7 @@ public function getById($id, $useConnection = 'read') */ public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = null, $severity = null, $isNew = null) { - if (is_null($buildId)) { + if (\is_null($buildId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -128,9 +128,9 @@ public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = nul $map = function ($item) { return new BuildError($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { @@ -222,7 +222,7 @@ public function getKnownPlugins($buildId, $severity = null, $isNew = '') $map = function ($item) { return $item['plugin']; }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } @@ -262,7 +262,7 @@ public function getKnownSeverities($buildId, $plugin = '', $isNew = '') return (int)$item['severity']; }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index bed5e1521..fe6ec248d 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -86,7 +86,7 @@ public function write( $lineEnd = null, $createdDate = null ) { - if (is_null($createdDate)) { + if (\is_null($createdDate)) { $createdDate = new DateTime(); } @@ -98,15 +98,15 @@ public function write( 'plugin' => (string)$plugin, 'message' => (string)$message, 'severity' => (int)$severity, - 'file' => !is_null($file) ? (string)$file : null, - 'line_start' => !is_null($lineStart) ? (int)$lineStart : null, - 'line_end' => !is_null($lineEnd) ? (int)$lineEnd : null, + 'file' => !\is_null($file) ? (string)$file : null, + 'line_start' => !\is_null($lineStart) ? (int)$lineStart : null, + 'line_end' => !\is_null($lineEnd) ? (int)$lineEnd : null, 'create_date' => $createdDate->format('Y-m-d H:i:s'), 'hash' => $hash, 'is_new' => $errorStore->getIsNewError($this->projectId, $hash) ? 1 : 0, ]; - if (count($this->errors) >= $this->bufferSize) { + if (\count($this->errors) >= $this->bufferSize) { $this->flush(); } } diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 254bf090f..cdaceb657 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -48,7 +48,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildMet */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('id passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -75,7 +75,7 @@ public function getById($id, $useConnection = 'read') */ public function getByKey($buildId, $key) { - if (is_null($buildId)) { + if (\is_null($buildId)) { throw new HttpException('buildId passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -110,7 +110,7 @@ public function getByKey($buildId, $key) */ public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') { - if (is_null($buildId)) { + if (\is_null($buildId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -125,9 +125,9 @@ public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') $map = function ($item) { return new BuildMeta($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { @@ -159,7 +159,7 @@ public function getErrorsForUpgrade($limit) return new BuildMeta($this->storeRegistry, $item); }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 3ceda08fb..900c6d638 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -51,7 +51,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Build */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -81,7 +81,7 @@ public function getById($id, $useConnection = 'read') */ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read') { - if (is_null($projectId)) { + if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -96,9 +96,9 @@ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read $map = function ($item) { return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { @@ -119,7 +119,7 @@ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read */ public function getByStatus($status, $limit = 1000, $useConnection = 'read') { - if (is_null($status)) { + if (\is_null($status)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -134,9 +134,9 @@ public function getByStatus($status, $limit = 1000, $useConnection = 'read') $map = function ($item) { return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { @@ -165,7 +165,7 @@ public function getBuilds($limit = 5, $offset = 0) return new Build($this->storeRegistry, $item); }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } @@ -206,7 +206,7 @@ public function getLatestBuildByProjectAndBranch($projectId, $branch) */ public function getLatestBuilds($projectId = null, $limit = 5) { - if (!is_null($projectId)) { + if (!\is_null($projectId)) { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :pid ORDER BY {{id}} DESC LIMIT :limit'; } else { $query = 'SELECT * FROM {{' . $this->tableName . '}} ORDER BY {{id}} DESC LIMIT :limit'; @@ -214,7 +214,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) $stmt = $this->databaseManager->getConnection('read')->prepare($query); - if (!is_null($projectId)) { + if (!\is_null($projectId)) { $stmt->bindValue(':pid', $projectId); } @@ -226,7 +226,7 @@ public function getLatestBuilds($projectId = null, $limit = 5) $map = function ($item) { return new Build($this->storeRegistry, $item); }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } @@ -308,24 +308,24 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) ]; } $build = null; - if (count($projects[$projectId][$environment]['latest']) < $limitByProject) { + if (\count($projects[$projectId][$environment]['latest']) < $limitByProject) { $build = new Build($this->storeRegistry, $item); $projects[$projectId][$environment]['latest'][] = $build; } - if (count($latest) < $limitAll) { - if (is_null($build)) { + if (\count($latest) < $limitAll) { + if (\is_null($build)) { $build = new Build($this->storeRegistry, $item); } $latest[] = $build; } if (empty($projects[$projectId][$environment]['success']) && Build::STATUS_SUCCESS === $item['status']) { - if (is_null($build)) { + if (\is_null($build)) { $build = new Build($this->storeRegistry, $item); } $projects[$projectId][$environment]['success'] = $build; } if (empty($projects[$projectId][$environment]['failed']) && Build::STATUS_FAILED === $item['status']) { - if (is_null($build)) { + if (\is_null($build)) { $build = new Build($this->storeRegistry, $item); } $projects[$projectId][$environment]['failed'] = $build; @@ -333,12 +333,12 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) } foreach ($projects as $idx => $project) { - $projects[$idx] = array_filter($project, function ($val) { + $projects[$idx] = \array_filter($project, function ($val) { return ($val['latest'][0]->getStatus() != Build::STATUS_SUCCESS); }); } - $projects = array_filter($projects); + $projects = \array_filter($projects); return ['projects' => $projects, 'latest' => $latest]; } else { @@ -369,9 +369,9 @@ public function getByProjectAndCommit($projectId, $commitId) return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - return ['items' => $rtn, 'count' => count($rtn)]; + return ['items' => $rtn, 'count' => \count($rtn)]; } else { return ['items' => [], 'count' => 0]; } @@ -426,7 +426,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR } // Include specific branch information if required: - if (!is_null($branch)) { + if (!\is_null($branch)) { $query .= ' AND b.branch = :branch '; } @@ -438,7 +438,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR $stmt->bindValue(':buildId', (int)$buildId, PDO::PARAM_INT); $stmt->bindValue(':numResults', (int)$numResults, PDO::PARAM_INT); - if (!is_null($branch)) { + if (!\is_null($branch)) { $stmt->bindValue(':branch', $branch, PDO::PARAM_STR); } @@ -448,9 +448,9 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR /** @var BuildErrorStore $errorStore */ $errorStore = $this->storeRegistry->get('BuildError'); - $rtn = array_reverse($rtn); - $rtn = array_map(function ($item) use ($key, $errorStore, $buildId) { - $item['meta_value'] = json_decode($item['meta_value'], true); + $rtn = \array_reverse($rtn); + $rtn = \array_map(function ($item) use ($key, $errorStore, $buildId) { + $item['meta_value'] = \json_decode($item['meta_value'], true); if ('plugin-summary' === $key) { foreach ($item['meta_value'] as $stage => $stageData) { foreach ($stageData as $plugin => $pluginData) { @@ -465,7 +465,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR return $item; }, $rtn); - if (!count($rtn)) { + if (!\count($rtn)) { return null; } else { return $rtn; @@ -487,7 +487,7 @@ public function setMeta($buildId, $key, $value) /** @var BuildMetaStore $store */ $store = $this->storeRegistry->get('BuildMeta'); $meta = $store->getByKey($buildId, $key); - if (is_null($meta)) { + if (\is_null($meta)) { $meta = new BuildMeta($this->storeRegistry); $meta->setBuildId($buildId); $meta->setMetaKey($key); @@ -519,7 +519,7 @@ public function deleteAllByProject($projectId) */ public function getOldByProject($projectId, $keep = 100) { - if (is_null($projectId)) { + if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -534,9 +534,9 @@ public function getOldByProject($projectId, $keep = 100) $map = function ($item) { return new Build($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 05401b660..abe30e9b9 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -49,7 +49,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Environm */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -79,7 +79,7 @@ public function getById($id, $useConnection = 'read') */ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read') { - if (is_null($name)) { + if (\is_null($name)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -109,7 +109,7 @@ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read' */ public function getByProjectId($projectId, $useConnection = 'read') { - if (is_null($projectId)) { + if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -124,9 +124,9 @@ public function getByProjectId($projectId, $useConnection = 'read') $map = function ($item) { return new Environment($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { diff --git a/src/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php index ab0360ecc..b70ef0361 100644 --- a/src/Store/ProjectGroupStore.php +++ b/src/Store/ProjectGroupStore.php @@ -48,7 +48,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?ProjectG */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -78,7 +78,7 @@ public function getById($id, $useConnection = 'read') */ public function getByTitle($title, $useConnection = 'read') { - if (is_null($title)) { + if (\is_null($title)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 25d50dc43..d6b1185c1 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -50,7 +50,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Project */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -83,7 +83,7 @@ public function getByIds($values, $useConnection = 'read') throw new HttpException('Values passed to ' . __FUNCTION__ . ' cannot be empty.'); } - $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} IN ('.implode(', ', array_map('intval', $values)).')'; + $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{id}} IN (' . \implode(', ', \array_map('intval', $values)).')'; $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $rtn = []; @@ -109,7 +109,7 @@ public function getByIds($values, $useConnection = 'read') */ public function getByTitle($title, $limit = 1000, $useConnection = 'read') { - if (is_null($title)) { + if (\is_null($title)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -125,9 +125,9 @@ public function getByTitle($title, $limit = 1000, $useConnection = 'read') $map = function ($item) { return new Project($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { @@ -155,7 +155,7 @@ public function getKnownBranches($projectId) return $item['branch']; }; - return array_map($map, $res); + return \array_map($map, $res); } else { return []; } @@ -183,9 +183,9 @@ public function getAll($archived = false) $map = function ($item) { return new Project($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; @@ -208,7 +208,7 @@ public function getAll($archived = false) */ public function getByGroupId($groupId, $archived = false, $limit = 1000, $useConnection = 'read') { - if (is_null($groupId)) { + if (\is_null($groupId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } $archived = (int)$archived; @@ -226,9 +226,9 @@ public function getByGroupId($groupId, $archived = false, $limit = 1000, $useCon $map = function ($item) { return new Project($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index 6b830be2a..625538969 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -49,7 +49,7 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?User */ public function getById($id, $useConnection = 'read') { - if (is_null($id)) { + if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -77,7 +77,7 @@ public function getById($id, $useConnection = 'read') */ public function getByEmail($email) { - if (is_null($email)) { + if (\is_null($email)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -106,7 +106,7 @@ public function getByEmail($email) */ public function getByEmailOrName($emailOrName) { - if (is_null($emailOrName)) { + if (\is_null($emailOrName)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -134,7 +134,7 @@ public function getByEmailOrName($emailOrName) */ public function getByRememberKey($rememberKey) { - if (is_null($rememberKey)) { + if (\is_null($rememberKey)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -164,7 +164,7 @@ public function getByRememberKey($rememberKey) */ public function getByName($name, $limit = 1000, $useConnection = 'read') { - if (is_null($name)) { + if (\is_null($name)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } @@ -179,9 +179,9 @@ public function getByName($name, $limit = 1000, $useConnection = 'read') $map = function ($item) { return new User($this->storeRegistry, $item); }; - $rtn = array_map($map, $res); + $rtn = \array_map($map, $res); - $count = count($rtn); + $count = \count($rtn); return ['items' => $rtn, 'count' => $count]; } else { diff --git a/src/StoreRegistry.php b/src/StoreRegistry.php index 60aaac79e..1c5e03741 100644 --- a/src/StoreRegistry.php +++ b/src/StoreRegistry.php @@ -31,11 +31,11 @@ public function __construct(DatabaseManager $databaseManager) /** * @param string $storeName * - * @return Store|null + * @return Store * * @throws RuntimeException */ - public function get(string $storeName): ?Store + public function get(string $storeName): Store { if (!isset($this->loadedStores[$storeName])) { try { diff --git a/src/View.php b/src/View.php index c71ac4776..fdcd7af85 100644 --- a/src/View.php +++ b/src/View.php @@ -37,14 +37,14 @@ public function __construct(string $file, ?string $path = null) protected static function getViewFile(string $file, ?string $path = null): string { - $viewPath = is_null($path) ? (SRC_DIR . 'View/') : $path; + $viewPath = \is_null($path) ? (SRC_DIR . 'View/') : $path; return $viewPath . $file . '.' . static::$extension; } public static function exists(string $file, ?string $path = null): bool { - if (!file_exists(self::getViewFile($file, $path))) { + if (!\file_exists(self::getViewFile($file, $path))) { return false; } diff --git a/src/View/Build/errors.phtml b/src/View/Build/errors.phtml index c28a53865..bff36390d 100644 --- a/src/View/Build/errors.phtml +++ b/src/View/Build/errors.phtml @@ -14,15 +14,15 @@ $linkTemplate = $build->getFileLinkTemplate(); foreach ($errors as $error): - $link = str_replace('{BASEFILE}', basename($error->getFile()), $linkTemplate); - $link = str_replace('{FILE}', $error->getFile(), $link); - $link = str_replace('{LINE}', $error->getLineStart(), $link); + $link = \str_replace('{BASEFILE}', \basename($error->getFile()), $linkTemplate); + $link = \str_replace('{FILE}', $error->getFile(), $link); + $link = \str_replace('{LINE}', $error->getLineStart(), $link); if ($error->getLineStart() == $error->getLineEnd() || !$error->getLineEnd()) { # For Github - $link = str_replace('-L{LINE_END}', '', $link); + $link = \str_replace('-L{LINE_END}', '', $link); } else { - $link = str_replace('{LINE_END}', $error->getLineEnd(), $link); + $link = \str_replace('{LINE_END}', $error->getLineEnd(), $link); } ?> diff --git a/src/View/Build/view.phtml b/src/View/Build/view.phtml index aaa4df65e..69b94d4c4 100644 --- a/src/View/Build/view.phtml +++ b/src/View/Build/view.phtml @@ -37,7 +37,7 @@ use PHPCensor\Model\Environment; - getSource(), Build::$pullRequestSources, true)): ?> + getSource(), Build::$pullRequestSources, true)): ?> getRemoteBranch(); ?> : @@ -327,7 +327,7 @@ use PHPCensor\Model\Environment; var BUILD_IS_NEW = ''; var ActiveBuild = new Build(getId(); ?>); - ActiveBuild.setupBuild(, getFileLinkTemplate()); ?>); + ActiveBuild.setupBuild(, getFileLinkTemplate()); ?>); var url = document.location.toString(); if (url.match('#')) { diff --git a/src/View/BuildStatus/view.phtml b/src/View/BuildStatus/view.phtml index ede0a6292..bf33bdeab 100644 --- a/src/View/BuildStatus/view.phtml +++ b/src/View/BuildStatus/view.phtml @@ -80,7 +80,7 @@ if (!empty($latest)): ?> - + @@ -121,7 +121,7 @@ if (!empty($latest)): ?> getCommitId())) { - print sprintf( + print \sprintf( '%s %s', $build->getCommitLink(), substr($build->getCommitId(), 0, 7), @@ -134,7 +134,7 @@ if (!empty($latest)): ?> - getSource(), Build::$pullRequestSources, true)): ?> + getSource(), Build::$pullRequestSources, true)): ?> getRemoteBranch(); ?> : @@ -145,7 +145,7 @@ if (!empty($latest)): ?> getBranch(); ?> getExtra('branches'); ?> - + getTag()): ?> / diff --git a/src/View/Group/index.phtml b/src/View/Group/index.phtml index d448f2b95..4a730306d 100644 --- a/src/View/Group/index.phtml +++ b/src/View/Group/index.phtml @@ -28,11 +28,11 @@ use PHPCensor\Model\User; - +
    - getIsAdmin() && (!count($group['projects']))): ?> + getIsAdmin() && (!\count($group['projects']))): ?> diff --git a/src/View/Home/index.phtml b/src/View/Home/index.phtml index d05f68865..b1dc82694 100644 --- a/src/View/Home/index.phtml +++ b/src/View/Home/index.phtml @@ -4,7 +4,7 @@ * @var array $widgets */ -$allWidgets = array_merge(array_keys($widgets['left']), array_keys($widgets['right'])); +$allWidgets = \array_merge(\array_keys($widgets['left']), \array_keys($widgets['right'])); foreach ($allWidgets as $widget) { ?> - + @@ -59,7 +59,7 @@ $branches = $build->getExtra('branches'); getCommitId())) { - print sprintf( + print \sprintf( '%s %s', $build->getCommitLink(), substr($build->getCommitId(), 0, 7), @@ -71,7 +71,7 @@ $branches = $build->getExtra('branches'); ?> - getSource(), Build::$pullRequestSources, true)): ?> + getSource(), Build::$pullRequestSources, true)): ?> getRemoteBranch(); ?> : @@ -81,7 +81,7 @@ $branches = $build->getExtra('branches'); getBranch(); ?> - + getTag()): ?> / @@ -108,7 +108,7 @@ $branches = $build->getExtra('branches'); getErrorsTotal(); ?> - getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> + getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> getErrorsTrend(); ?> diff --git a/src/View/Project/edit.phtml b/src/View/Project/edit.phtml index d5b4f1e3c..a3eea3517 100644 --- a/src/View/Project/edit.phtml +++ b/src/View/Project/edit.phtml @@ -34,7 +34,7 @@ use PHPCensor\Helper\Lang;
    - +
    diff --git a/src/View/Project/view.phtml b/src/View/Project/view.phtml index 07e45a4bc..1843e0107 100644 --- a/src/View/Project/view.phtml +++ b/src/View/Project/view.phtml @@ -43,26 +43,26 @@ use PHPCensor\Model\User; getArchived()): ?> getIsAdmin()): ?> - + - + - + - + - + @@ -172,7 +172,7 @@ use PHPCensor\Model\User;
    - getType(), [ + getType(), [ Project::TYPE_GITHUB, Project::TYPE_GITLAB, Project::TYPE_BITBUCKET, diff --git a/src/View/WidgetAllProjects/index-projects.phtml b/src/View/WidgetAllProjects/index-projects.phtml index 1a56242fd..6200c9240 100644 --- a/src/View/WidgetAllProjects/index-projects.phtml +++ b/src/View/WidgetAllProjects/index-projects.phtml @@ -17,7 +17,7 @@ foreach ($projects as $project): $success = null; $failure = null; - if (count($builds[$project->getId()])) { + if (\count($builds[$project->getId()])) { // Get the most recent build status to determine the main block colour. $lastBuild = $builds[$project->getId()][0]; $status = $lastBuild->getStatus(); @@ -50,18 +50,18 @@ foreach ($projects as $project): break; case Build::STATUS_SUCCESS: $statuses[] = 'ok'; - $success = is_null($success) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; + $success = \is_null($success) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; break; case Build::STATUS_FAILED: $failures++; $statuses[] = 'failed'; - $failure = is_null($failure) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; + $failure = \is_null($failure) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; break; } } } - $buildCount = count($builds[$project->getId()]); + $buildCount = \count($builds[$project->getId()]); $lastSuccess = $successful[$project->getId()]; $lastFailure = $failed[$project->getId()]; $message = Lang::get('no_builds_yet'); @@ -70,7 +70,7 @@ foreach ($projects as $project): if ($failures > 0) { $message = Lang::get('x_of_x_failed', $failures, $buildCount); - if (!is_null($lastSuccess) && !is_null($lastSuccess->getFinishDate())) { + if (!\is_null($lastSuccess) && !\is_null($lastSuccess->getFinishDate())) { $message .= Lang::get('last_successful_build', $lastSuccess->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_built_successfully'); @@ -78,7 +78,7 @@ foreach ($projects as $project): } else { $message = Lang::get('all_builds_passed', $buildCount); - if (!is_null($lastFailure) && !is_null($lastFailure->getFinishDate())) { + if (!\is_null($lastFailure) && !\is_null($lastFailure->getFinishDate())) { $message .= Lang::get('last_failed_build', $lastFailure->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_failed_build'); diff --git a/src/View/WidgetAllProjects/update.phtml b/src/View/WidgetAllProjects/update.phtml index ec3b4c6c9..cb134856c 100644 --- a/src/View/WidgetAllProjects/update.phtml +++ b/src/View/WidgetAllProjects/update.phtml @@ -13,7 +13,7 @@ $backgroundClass = 'gray'; $success = null; $failure = null; -if (count($builds)) { +if (\count($builds)) { // Get the most recent build status to determine the main block colour. $lastBuild = $builds[0]; $status = $lastBuild->getStatus(); @@ -44,18 +44,18 @@ if (count($builds)) { break; case Build::STATUS_SUCCESS: $statuses[] = 'ok'; - $success = is_null($success) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; + $success = \is_null($success) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; break; case Build::STATUS_FAILED: $failures++; $statuses[] = 'failed'; - $failure = is_null($failure) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; + $failure = \is_null($failure) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; break; } } } -$buildCount = count($builds); +$buildCount = \count($builds); $lastSuccess = $successful; $lastFailure = $failed; $message = Lang::get('no_builds_yet'); @@ -64,7 +64,7 @@ if ($buildCount > 0) { if ($failures > 0) { $message = Lang::get('x_of_x_failed', $failures, $buildCount); - if (!is_null($lastSuccess) && !is_null($lastSuccess->getFinishDate())) { + if (!\is_null($lastSuccess) && !\is_null($lastSuccess->getFinishDate())) { $message .= Lang::get('last_successful_build', $lastSuccess->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_built_successfully'); @@ -72,7 +72,7 @@ if ($buildCount > 0) { } else { $message = Lang::get('all_builds_passed', $buildCount); - if (!is_null($lastFailure) && !is_null($lastFailure->getFinishDate())) { + if (!\is_null($lastFailure) && !\is_null($lastFailure->getFinishDate())) { $message .= Lang::get('last_failed_build', $lastFailure->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_failed_build'); diff --git a/src/View/WidgetBuildErrors/update.phtml b/src/View/WidgetBuildErrors/update.phtml index df912fa82..cf1bad1ce 100644 --- a/src/View/WidgetBuildErrors/update.phtml +++ b/src/View/WidgetBuildErrors/update.phtml @@ -51,17 +51,17 @@ foreach ($builds as $projectId => $projectEnvs): break; case Build::STATUS_SUCCESS: $statuses[] = 'ok'; - $success = is_null($success) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; + $success = \is_null($success) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $success; break; case Build::STATUS_FAILED: $failures++; $statuses[] = 'failed'; - $failure = is_null($failure) && !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; + $failure = \is_null($failure) && !\is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : $failure; break; } } - $buildCount = count($projectEnv['latest']); + $buildCount = \count($projectEnv['latest']); $lastSuccess = $projectEnv['success']; $lastFailure = $projectEnv['failed']; $message = Lang::get('no_builds_yet'); @@ -70,7 +70,7 @@ foreach ($builds as $projectId => $projectEnvs): if ($failures > 0) { $message = Lang::get('x_of_x_failed', $failures, $buildCount); - if (!is_null($lastSuccess) && !is_null($lastSuccess->getFinishDate())) { + if (!\is_null($lastSuccess) && !\is_null($lastSuccess->getFinishDate())) { $message .= Lang::get('last_successful_build', $lastSuccess->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_built_successfully'); @@ -78,7 +78,7 @@ foreach ($builds as $projectId => $projectEnvs): } else { $message = Lang::get('all_builds_passed', $buildCount); - if (!is_null($lastFailure) && !is_null($lastFailure->getFinishDate())) { + if (!\is_null($lastFailure) && !\is_null($lastFailure->getFinishDate())) { $message .= Lang::get('last_failed_build', $lastFailure->getFinishDate()->format('Y-m-d H:i:s')); } else { $message .= Lang::get('never_failed_build'); diff --git a/src/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml index d6fb14dcf..b56dad556 100644 --- a/src/View/WidgetLastBuilds/update.phtml +++ b/src/View/WidgetLastBuilds/update.phtml @@ -94,7 +94,7 @@ use PHPCensor\Store\EnvironmentStore; — : getErrorsTotal(); ?> - getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> + getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> getErrorsTrend(); ?> @@ -112,7 +112,7 @@ use PHPCensor\Store\EnvironmentStore;

    - getSource(), Build::$pullRequestSources, true)): ?> + getSource(), Build::$pullRequestSources, true)): ?> getRemoteBranch(); ?> : @@ -123,7 +123,7 @@ use PHPCensor\Store\EnvironmentStore; getBranch(); ?> - + getTag()): ?> / @@ -133,7 +133,7 @@ use PHPCensor\Store\EnvironmentStore; getCommitId())) { echo ' — '; - echo sprintf( + echo \sprintf( '%s %s', $build->getCommitLink(), substr($build->getCommitId(), 0, 7), diff --git a/src/View/layout.phtml b/src/View/layout.phtml index 04b9b8c21..b0022442b 100644 --- a/src/View/layout.phtml +++ b/src/View/layout.phtml @@ -45,10 +45,10 @@ use PHPCensor\Model\User; var APP_URL = ''; var LANGUAGE = ''; - - var STRINGS = ; + + var STRINGS = ; - var STRINGS = ; + var STRINGS = ; @@ -152,7 +152,7 @@ use PHPCensor\Model\User;

      - > + > @@ -193,7 +193,7 @@ use PHPCensor\Model\User; - +
      • @@ -215,7 +215,7 @@ use PHPCensor\Model\User; - +
        • diff --git a/tests/src/ConfigurationTest.php b/tests/src/ConfigurationTest.php index c518fc7e0..a8a1cdce9 100644 --- a/tests/src/ConfigurationTest.php +++ b/tests/src/ConfigurationTest.php @@ -18,7 +18,7 @@ public function testEmptyYamlConfig() public function testYamlConfig() { - $configuration = new Configuration(dirname(__DIR__) . '/data/configuration.yml'); + $configuration = new Configuration(\dirname(__DIR__) . '/data/configuration.yml'); self::assertEquals(['test' => 'test'], $configuration->all()); } diff --git a/tests/src/Form/Validator/YamlValidatorTest.php b/tests/src/Form/Validator/YamlValidatorTest.php index 260cdbbcd..d0cdd854c 100644 --- a/tests/src/Form/Validator/YamlValidatorTest.php +++ b/tests/src/Form/Validator/YamlValidatorTest.php @@ -31,7 +31,7 @@ public function getDatasetFail() public function testYamlValidatorSuccess($value) { $validator = new Yaml(); - $result = call_user_func_array($validator, [$value]); + $result = \call_user_func_array($validator, [$value]); $this->assertTrue($result); } @@ -42,6 +42,6 @@ public function testYamlValidatorFail($value) { $this->expectException('Exception'); $validator = new Yaml(); - call_user_func_array($validator, [$value]); + \call_user_func_array($validator, [$value]); } } diff --git a/tests/src/FormTest.php b/tests/src/FormTest.php index a72d64d94..bfa136993 100644 --- a/tests/src/FormTest.php +++ b/tests/src/FormTest.php @@ -34,9 +34,9 @@ public function testElementBasics() $output = $f->render(); - self::assertTrue(is_string($output)); + self::assertTrue(\is_string($output)); self::assertTrue(!empty($output)); - self::assertTrue(strpos($output, 'container-class') !== false); + self::assertTrue(\strpos($output, 'container-class') !== false); } public function testInputBasics() @@ -51,7 +51,7 @@ public function testInputBasics() self::assertTrue($f->getValue() == 'input-value'); self::assertTrue($f->getRequired() == true); - self::assertTrue(is_callable($f->getValidator())); + self::assertTrue(\is_callable($f->getValidator())); } public function testInputCreate() @@ -131,21 +131,21 @@ public function testFieldSetBasics() $f->setValues(['group' => ['one' => 'ONE', 'two' => 'TWO'], 'three' => 'THREE']); $values = $f->getValues(); - self::assertTrue(is_array($values)); - self::assertTrue(array_key_exists('group', $values)); - self::assertTrue(array_key_exists('one', $values['group'])); - self::assertTrue(array_key_exists('three', $values)); + self::assertTrue(\is_array($values)); + self::assertTrue(\array_key_exists('group', $values)); + self::assertTrue(\array_key_exists('one', $values['group'])); + self::assertTrue(\array_key_exists('three', $values)); self::assertTrue($values['group']['one'] == 'ONE'); self::assertTrue($values['group']['two'] == 'TWO'); self::assertTrue($values['three'] == 'THREE'); self::assertTrue($f->validate()); $html = $f->render(); - self::assertTrue(strpos($html, 'one') !== false); - self::assertTrue(strpos($html, 'two') !== false); + self::assertTrue(\strpos($html, 'one') !== false); + self::assertTrue(\strpos($html, 'two') !== false); $children = $f->getChildren(); - self::assertEquals(2, count($children)); + self::assertEquals(2, \count($children)); self::assertEquals($f2, $children[$f2->getName()]); self::assertEquals($f3, $children[$f3->getName()]); @@ -157,65 +157,65 @@ public function testElements() { $e = new Form\Element\Button(); self::assertTrue($e->validate()); - self::assertTrue(strpos($e->render(), 'button') !== false); + self::assertTrue(\strpos($e->render(), 'button') !== false); $e = new Form\Element\Checkbox(); $e->setCheckedValue('ten'); self::assertTrue($e->getCheckedValue() == 'ten'); - self::assertTrue(strpos($e->render(), 'checkbox') !== false); - self::assertTrue(strpos($e->render(), 'checked') === false); + self::assertTrue(\strpos($e->render(), 'checkbox') !== false); + self::assertTrue(\strpos($e->render(), 'checked') === false); $e->setValue(true); - self::assertTrue(strpos($e->render(), 'checked') !== false); + self::assertTrue(\strpos($e->render(), 'checked') !== false); $e->setValue('ten'); - self::assertTrue(strpos($e->render(), 'checked') !== false); + self::assertTrue(\strpos($e->render(), 'checked') !== false); $e->setValue('fail'); - self::assertTrue(strpos($e->render(), 'checked') === false); + self::assertTrue(\strpos($e->render(), 'checked') === false); $e = new Form\Element\CheckboxGroup(); - self::assertTrue(strpos($e->render(), 'group') !== false); + self::assertTrue(\strpos($e->render(), 'group') !== false); $e = new Form\ControlGroup(); - self::assertTrue(strpos($e->render(), 'group') !== false); + self::assertTrue(\strpos($e->render(), 'group') !== false); $e = new Form\Element\Email(); - self::assertTrue(strpos($e->render(), 'email') !== false); + self::assertTrue(\strpos($e->render(), 'email') !== false); $e = new Form\Element\Select(); $e->setOptions(['key' => 'Val']); $html = $e->render(); - self::assertTrue(strpos($html, 'select') !== false); - self::assertTrue(strpos($html, 'option') !== false); - self::assertTrue(strpos($html, 'key') !== false); - self::assertTrue(strpos($html, 'Val') !== false); + self::assertTrue(\strpos($html, 'select') !== false); + self::assertTrue(\strpos($html, 'option') !== false); + self::assertTrue(\strpos($html, 'key') !== false); + self::assertTrue(\strpos($html, 'Val') !== false); $e = new Form\Element\Submit(); self::assertTrue($e->validate()); - self::assertTrue(strpos($e->render(), 'submit') !== false); + self::assertTrue(\strpos($e->render(), 'submit') !== false); $e = new Form\Element\Text(); $e->setValue('test'); - self::assertTrue(strpos($e->render(), 'test') !== false); + self::assertTrue(\strpos($e->render(), 'test') !== false); $e = new Form\Element\TextArea(); $e->setRows(10); - self::assertTrue(strpos($e->render(), '10') !== false); + self::assertTrue(\strpos($e->render(), '10') !== false); $e = new Form\Element\Url(); - self::assertTrue(strpos($e->render(), 'url') !== false); + self::assertTrue(\strpos($e->render(), 'url') !== false); $_SESSION = []; $e = new Form\Element\Csrf(); - self::assertTrue(strpos($e->render(), $e->getValue()) !== false); + self::assertTrue(\strpos($e->render(), $e->getValue()) !== false); self::assertEquals($_SESSION['csrf_tokens'][$e->getName()], $e->getValue()); self::assertTrue($e->validate()); $e->setValue('111'); self::assertFalse($e->validate()); $e = new Form\Element\Password(); - self::assertTrue(strpos($e->render(), 'password') !== false); + self::assertTrue(\strpos($e->render(), 'password') !== false); } } diff --git a/tests/src/Plugin/CopyBuildTest.php b/tests/src/Plugin/CopyBuildTest.php index c90248f94..093186cc4 100644 --- a/tests/src/Plugin/CopyBuildTest.php +++ b/tests/src/Plugin/CopyBuildTest.php @@ -29,14 +29,14 @@ protected function tearDown() : void ]; foreach ($filenames as $filename) { - if (is_dir($directory . $filename)) { - @rmdir($directory . $filename); - } elseif (is_file($directory . $filename)) { - @unlink($directory . $filename); + if (\is_dir($directory . $filename)) { + @\rmdir($directory . $filename); + } elseif (\is_file($directory . $filename)) { + @\unlink($directory . $filename); } } - @rmdir($directory); + @\rmdir($directory); } } } @@ -47,14 +47,14 @@ protected function setUp(): void $directory = $this->buildTemp(); - mkdir($directory); + \mkdir($directory); - file_put_contents($directory . 'one.php', ''); - file_put_contents($directory . '.two.yml', ''); + \file_put_contents($directory . 'one.php', ''); + \file_put_contents($directory . '.two.yml', ''); - mkdir($directory . 'tree'); + \mkdir($directory . 'tree'); - file_put_contents($directory . 'tree/four.php', ''); + \file_put_contents($directory . 'tree/four.php', ''); $this->directories[] = $directory; $this->buildPath = $directory; @@ -62,8 +62,8 @@ protected function setUp(): void protected function buildTemp() { - $directory = tempnam(ROOT_DIR . 'tests/runtime/', 'copy_build_test_'); - @unlink($directory); + $directory = \tempnam(ROOT_DIR . 'tests/runtime/', 'copy_build_test_'); + @\unlink($directory); return $directory . '/'; } @@ -98,7 +98,7 @@ protected function getPlugin(array $options = []) ->expects($this->any()) ->method('executeCommand') ->willReturnCallback(function () use ($executor) { - $args = func_get_args(); + $args = \func_get_args(); return $executor->executeCommand($args); }); @@ -120,16 +120,16 @@ public function testExecuteAbsolute() self::assertTrue($plugin->execute()); - self::assertTrue(file_exists($directory)); - self::assertTrue(is_dir($directory)); + self::assertTrue(\file_exists($directory)); + self::assertTrue(\is_dir($directory)); - self::assertTrue(file_exists($directory . '/one.php')); - self::assertTrue(file_exists($directory . '.two.yml')); + self::assertTrue(\file_exists($directory . '/one.php')); + self::assertTrue(\file_exists($directory . '.two.yml')); - self::assertTrue(file_exists($directory . '/tree')); - self::assertTrue(is_dir($directory . '/tree')); + self::assertTrue(\file_exists($directory . '/tree')); + self::assertTrue(\is_dir($directory . '/tree')); - self::assertTrue(file_exists($directory . '/tree/four.php')); + self::assertTrue(\file_exists($directory . '/tree/four.php')); } public function testExecuteRelative() @@ -143,15 +143,15 @@ public function testExecuteRelative() self::assertTrue($plugin->execute()); - self::assertTrue(file_exists(realpath($this->buildPath . '/../copy_build_test_relative'))); - self::assertTrue(is_dir(realpath($this->buildPath . '/../copy_build_test_relative'))); + self::assertTrue(\file_exists(\realpath($this->buildPath . '/../copy_build_test_relative'))); + self::assertTrue(\is_dir(\realpath($this->buildPath . '/../copy_build_test_relative'))); - self::assertTrue(file_exists(realpath($this->buildPath . '/../copy_build_test_relative/one.php'))); - self::assertTrue(file_exists(realpath($this->buildPath . '/../copy_build_test_relative/.two.yml'))); + self::assertTrue(\file_exists(\realpath($this->buildPath . '/../copy_build_test_relative/one.php'))); + self::assertTrue(\file_exists(\realpath($this->buildPath . '/../copy_build_test_relative/.two.yml'))); - self::assertTrue(file_exists(realpath($this->buildPath . '/../copy_build_test_relative/tree'))); - self::assertTrue(is_dir(realpath($this->buildPath . '/../copy_build_test_relative/tree'))); + self::assertTrue(\file_exists(\realpath($this->buildPath . '/../copy_build_test_relative/tree'))); + self::assertTrue(\is_dir(\realpath($this->buildPath . '/../copy_build_test_relative/tree'))); - self::assertTrue(file_exists(realpath($this->buildPath . '/../copy_build_test_relative/tree/four.php'))); + self::assertTrue(\file_exists(\realpath($this->buildPath . '/../copy_build_test_relative/tree/four.php'))); } } diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index e67d98a9c..4b2fc6ec2 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -133,7 +133,7 @@ protected function loadEmailPluginWithOptions($arrOptions = [], $buildStatus = n { $this->mailDelivered = $mailDelivered; - if (is_null($buildStatus)) { + if (\is_null($buildStatus)) { $this->buildStatus = Build::STATUS_SUCCESS; } else { $this->buildStatus = $buildStatus; diff --git a/tests/src/Plugin/PharTest.php b/tests/src/Plugin/PharTest.php index 49d924936..b65382d11 100644 --- a/tests/src/Plugin/PharTest.php +++ b/tests/src/Plugin/PharTest.php @@ -41,8 +41,8 @@ protected function getPlugin(array $options = []) protected function buildTemp() { - $directory = tempnam(ROOT_DIR . 'tests/runtime/', 'phar_test_'); - @unlink($directory); + $directory = \tempnam(ROOT_DIR . 'tests/runtime/', 'phar_test_'); + @\unlink($directory); return $directory . '/'; } @@ -51,13 +51,13 @@ protected function buildSource() { $directory = $this->buildTemp(); - mkdir($directory); - file_put_contents($directory . 'one.php', 'directories[] = $directory; @@ -80,21 +80,21 @@ protected function cleanSource() ]; foreach ($filenames as $filename) { - if (is_dir($directory . $filename)) { - @rmdir($directory . $filename); - } elseif (is_file($directory . $filename)) { - @unlink($directory . $filename); + if (\is_dir($directory . $filename)) { + @\rmdir($directory . $filename); + } elseif (\is_file($directory . $filename)) { + @\unlink($directory . $filename); } } - @rmdir($directory); + @\rmdir($directory); } } } protected function checkReadonly() { - if (ini_get('phar.readonly')) { + if (\ini_get('phar.readonly')) { $this->markTestSkipped('Test skipped because phar writing disabled in php.ini.'); } } @@ -181,13 +181,13 @@ public function testExecuteStub() $plugin = $this->getPlugin(['stub' => 'stub.php']); - file_put_contents($plugin->getBuilder()->buildPath . 'stub.php', $content); + \file_put_contents($plugin->getBuilder()->buildPath . 'stub.php', $content); self::assertTrue($plugin->execute()); self::assertFileExists($plugin->getBuilder()->buildPath . 'build.phar'); $phar = new PHPPhar($plugin->getBuilder()->buildPath . 'build.phar'); - self::assertEquals($content, trim($phar->getStub())); // + trim because PHP adds newline char + self::assertEquals($content, \trim($phar->getStub())); // + trim because PHP adds newline char } public function testExecuteUnknownDirectory() diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index 3bed2ad0f..336f819a2 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -125,7 +125,7 @@ public function testExecutePlugin_LogsFailureForNonExistentClasses() $options = []; $pluginName = 'DOESNTEXIST'; - $this->mockBuildLogger->logFailure(sprintf('Plugin does not exist: %s', $pluginName))->shouldBeCalledTimes(1); + $this->mockBuildLogger->logFailure(\sprintf('Plugin does not exist: %s', $pluginName))->shouldBeCalledTimes(1); $this->testedExecutor->executePlugin($pluginName, $options); } diff --git a/tests/src/Plugin/Util/PhpUnitResultTest.php b/tests/src/Plugin/Util/PhpUnitResultTest.php index 45476c997..11c9860db 100644 --- a/tests/src/Plugin/Util/PhpUnitResultTest.php +++ b/tests/src/Plugin/Util/PhpUnitResultTest.php @@ -73,11 +73,11 @@ public function testSkippedAnything() if (self::$skipped) { $msg = "Skipped result tests:\n"; foreach (self::$skipped as $skip) { - $exMsg = strstr((string)$skip['ex'], "\n", true); + $exMsg = \strstr((string)$skip['ex'], "\n", true); if (false === $exMsg) { $exMsg = (string)$skip['ex']; } - $msg .= sprintf(" * %s: %s \n", $skip['cls'], $exMsg); + $msg .= \sprintf(" * %s: %s \n", $skip['cls'], $exMsg); } $this->markTestSkipped($msg); } diff --git a/tests/src/PluginTest.php b/tests/src/PluginTest.php index 33032eb39..c48fa2082 100644 --- a/tests/src/PluginTest.php +++ b/tests/src/PluginTest.php @@ -83,7 +83,7 @@ class PluginTest extends TestCase protected function setUp(): void { - $this->currentDir = rtrim(realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; + $this->currentDir = \rtrim(\realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; $this->builder = $this->createMock(Builder::class); $this->build = $this->createMock(Build::class); @@ -163,16 +163,16 @@ public function testDirectory() ]; $plugin = new TestPlugin($this->builder, $this->build, $options); - self::assertEquals(dirname(__DIR__) . '/data/builds/', $plugin->getDirectory()); + self::assertEquals(\dirname(__DIR__) . '/data/builds/', $plugin->getDirectory()); $options = [ 'directory' => '../../', ]; $plugin = new TestPlugin($this->builder, $this->build, $options); - self::assertEquals(dirname(__DIR__) . '/data/', $plugin->getDirectory()); + self::assertEquals(\dirname(__DIR__) . '/data/', $plugin->getDirectory()); - $absoluteRealPath = rtrim(realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; + $absoluteRealPath = \rtrim(\realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; $options = [ 'directory' => $absoluteRealPath, @@ -297,7 +297,7 @@ public function testBinary() self::assertEquals('/builder/bin/', $plugin->getBinaryPath()); self::assertEquals(['example1', 'example2'], $plugin->getBinaryName()); - $absoluteRealPath = rtrim(realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; + $absoluteRealPath = \rtrim(\realpath(__DIR__ . '/../data/builds/build_x/'), '/\\') . '/'; $this->builder->binaryPath = $this->builder->interpolate($absoluteRealPath . '%COMMIT_ID%/'); $plugin = new TestPlugin($this->builder, $this->build, []); From bffdb12457799e3cee967765d31e762f765ab8f0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:13:30 +0700 Subject: [PATCH 019/212] Authors and phpdocs. --- src/Controller.php | 1 + src/Form.php | 7 +++++++ src/Form/ControlGroup.php | 7 +++++++ src/Form/Element.php | 7 +++++++ src/Form/Element/Button.php | 7 +++++++ src/Form/Element/Checkbox.php | 7 +++++++ src/Form/Element/CheckboxGroup.php | 7 +++++++ src/Form/Element/Csrf.php | 7 +++++++ src/Form/Element/Email.php | 7 +++++++ src/Form/Element/Hidden.php | 7 +++++++ src/Form/Element/Password.php | 7 +++++++ src/Form/Element/Radio.php | 7 +++++++ src/Form/Element/Select.php | 7 +++++++ src/Form/Element/Submit.php | 7 +++++++ src/Form/Element/Text.php | 7 +++++++ src/Form/Element/TextArea.php | 7 +++++++ src/Form/Element/Url.php | 7 +++++++ src/Form/FieldSet.php | 7 +++++++ src/Form/Input.php | 7 +++++++ src/Form/Validator/ValidatorInterface.php | 6 ++++++ src/Form/Validator/Yaml.php | 6 ++++++ src/Helper/Bitbucket.php | 5 +++++ src/Helper/Branch.php | 6 ++++++ src/Helper/BuildInterpolator.php | 5 +++++ src/Helper/CommandExecutor.php | 5 +++++ src/Helper/CommandExecutorInterface.php | 6 ++++++ src/Helper/Diff.php | 5 +++++ src/Helper/Email.php | 5 +++++ src/Helper/Github.php | 5 +++++ src/Helper/Lang.php | 5 +++++ src/Helper/MailerFactory.php | 5 +++++ src/Helper/SshKey.php | 5 +++++ src/Helper/Template.php | 6 ++++++ src/Helper/Xml.php | 6 ++++++ src/Helper/Xml/Utf8CleanFilter.php | 6 ++++++ src/Http/Request.php | 7 +++++++ src/Http/Response.php | 7 +++++++ src/Http/Response/JsonResponse.php | 7 +++++++ src/Http/Response/RedirectResponse.php | 7 +++++++ src/Http/Router.php | 7 +++++++ src/Migrations/20200505070903_initial_migration_v2.php | 6 ++++++ src/Model.php | 1 + src/Model/Base/Build.php | 7 +++++++ src/Model/Base/BuildError.php | 7 +++++++ src/Model/Base/BuildMeta.php | 7 +++++++ src/Model/Base/Environment.php | 6 ++++++ src/Model/Base/Project.php | 7 +++++++ src/Model/Base/ProjectGroup.php | 6 ++++++ src/Model/Base/User.php | 7 +++++++ src/Model/Build.php | 4 ++++ src/Model/Build/BitbucketBuild.php | 4 ++++ src/Model/Build/BitbucketHgBuild.php | 4 ++++ src/Model/Build/BitbucketServerBuild.php | 6 ++++++ src/Model/Build/GitBuild.php | 4 ++++ src/Model/Build/GithubBuild.php | 4 ++++ src/Model/Build/GitlabBuild.php | 4 ++++ src/Model/Build/GogsBuild.php | 5 +++++ src/Model/Build/HgBuild.php | 4 ++++ src/Model/Build/LocalBuild.php | 4 ++++ src/Model/Build/SvnBuild.php | 4 ++++ src/Model/BuildError.php | 7 +++++++ src/Model/BuildMeta.php | 7 +++++++ src/Model/Environment.php | 6 ++++++ src/Model/Project.php | 4 ++++ src/Model/ProjectGroup.php | 6 ++++++ src/Model/User.php | 4 ++++ src/Plugin/Atoum.php | 5 +++++ src/Plugin/Behat.php | 4 ++++ src/Plugin/BitbucketNotify.php | 6 ++++++ src/Plugin/CampfireNotify.php | 4 ++++ src/Plugin/CleanBuild.php | 4 ++++ src/Plugin/Codeception.php | 4 ++++ src/Plugin/Composer.php | 4 ++++ src/Plugin/CopyBuild.php | 4 ++++ src/Plugin/Deployer.php | 4 ++++ src/Plugin/DeployerOrg.php | 4 ++++ src/Plugin/EmailNotify.php | 4 ++++ src/Plugin/Env.php | 4 ++++ src/Plugin/FlowdockNotify.php | 4 ++++ src/Plugin/Git.php | 4 ++++ src/Plugin/Grunt.php | 4 ++++ src/Plugin/Gulp.php | 4 ++++ src/Plugin/HipchatNotify.php | 4 ++++ src/Plugin/IrcNotify.php | 4 ++++ src/Plugin/Lint.php | 4 ++++ src/Plugin/Mage.php | 9 ++++----- src/Plugin/Mage3.php | 9 ++++----- src/Plugin/Mysql.php | 4 ++++ src/Plugin/Option/PhpUnitOptions.php | 4 ++++ src/Plugin/PackageBuild.php | 4 ++++ src/Plugin/Pahout.php | 8 ++++++-- src/Plugin/Pdepend.php | 4 ++++ src/Plugin/Pgsql.php | 4 ++++ src/Plugin/Phan.php | 5 +++++ src/Plugin/Phar.php | 5 +++++ src/Plugin/Phing.php | 4 ++++ src/Plugin/Phlint.php | 5 +++++ src/Plugin/PhpCodeSniffer.php | 4 ++++ src/Plugin/PhpCpd.php | 4 ++++ src/Plugin/PhpCsFixer.php | 4 ++++ src/Plugin/PhpDocblockChecker.php | 4 ++++ src/Plugin/PhpLoc.php | 4 ++++ src/Plugin/PhpMessDetector.php | 4 ++++ src/Plugin/PhpParallelLint.php | 4 ++++ src/Plugin/PhpSpec.php | 4 ++++ src/Plugin/PhpStan.php | 5 +++++ src/Plugin/PhpTalLint.php | 4 ++++ src/Plugin/PhpUnit.php | 4 ++++ src/Plugin/Psalm.php | 5 +++++ src/Plugin/SecurityChecker.php | 3 +++ src/Plugin/SensiolabsInsight.php | 4 ++++ src/Plugin/Shell.php | 4 ++++ src/Plugin/SlackNotify.php | 4 ++++ src/Plugin/Sqlite.php | 3 +++ src/Plugin/TechnicalDebt.php | 4 ++++ src/Plugin/TelegramNotify.php | 4 ++++ src/Plugin/Util/BitbucketNotifyPhpUnitResult.php | 6 ++++++ src/Plugin/Util/BitbucketNotifyPluginResult.php | 6 ++++++ src/Plugin/Util/Executor.php | 5 +++++ src/Plugin/Util/PhpUnitResult.php | 4 ++++ src/Plugin/Util/PhpUnitResultJson.php | 4 ++++ src/Plugin/Util/PhpUnitResultJunit.php | 4 ++++ src/Plugin/Util/TestResultParsers/Codeception.php | 6 +++++- src/Plugin/Util/TestResultParsers/ParserInterface.php | 7 +++++++ src/Plugin/WebhookNotify.php | 4 ++++ src/Plugin/Wipe.php | 4 ++++ src/Plugin/XmppNotify.php | 4 ++++ src/Service/BuildService.php | 1 + src/Service/BuildStatusService.php | 1 + src/Service/ProjectService.php | 1 + src/Service/UserService.php | 1 + src/Store.php | 1 + src/Store/BuildErrorStore.php | 1 + src/Store/BuildErrorWriter.php | 1 + src/Store/BuildMetaStore.php | 1 + src/View.php | 1 + src/Worker/BuildWorker.php | 1 + 137 files changed, 655 insertions(+), 13 deletions(-) diff --git a/src/Controller.php b/src/Controller.php index a8a2a58e2..c62d8119f 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -11,6 +11,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ abstract class Controller diff --git a/src/Form.php b/src/Form.php index 18b4c092e..ef9905b96 100644 --- a/src/Form.php +++ b/src/Form.php @@ -4,6 +4,13 @@ use PHPCensor\Form\FieldSet; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Form extends FieldSet { /** diff --git a/src/Form/ControlGroup.php b/src/Form/ControlGroup.php index 37afe8e6f..fc7c89452 100644 --- a/src/Form/ControlGroup.php +++ b/src/Form/ControlGroup.php @@ -2,6 +2,13 @@ namespace PHPCensor\Form; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class ControlGroup extends FieldSet { } diff --git a/src/Form/Element.php b/src/Form/Element.php index 8710288f3..f537e25cc 100644 --- a/src/Form/Element.php +++ b/src/Form/Element.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ abstract class Element { /** diff --git a/src/Form/Element/Button.php b/src/Form/Element/Button.php index 0472868d6..6390658bf 100644 --- a/src/Form/Element/Button.php +++ b/src/Form/Element/Button.php @@ -5,6 +5,13 @@ use PHPCensor\Form\Input; use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Button extends Input { /** diff --git a/src/Form/Element/Checkbox.php b/src/Form/Element/Checkbox.php index e38ba194d..2ec1c6c34 100644 --- a/src/Form/Element/Checkbox.php +++ b/src/Form/Element/Checkbox.php @@ -5,6 +5,13 @@ use PHPCensor\Form\Input; use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Checkbox extends Input { /** diff --git a/src/Form/Element/CheckboxGroup.php b/src/Form/Element/CheckboxGroup.php index 272bfbac2..38779f928 100644 --- a/src/Form/Element/CheckboxGroup.php +++ b/src/Form/Element/CheckboxGroup.php @@ -4,6 +4,13 @@ use PHPCensor\Form\FieldSet; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class CheckboxGroup extends FieldSet { } diff --git a/src/Form/Element/Csrf.php b/src/Form/Element/Csrf.php index 71bb1287b..46ad78afd 100644 --- a/src/Form/Element/Csrf.php +++ b/src/Form/Element/Csrf.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Csrf extends Hidden { /** diff --git a/src/Form/Element/Email.php b/src/Form/Element/Email.php index f8c51fb82..c404d30fc 100644 --- a/src/Form/Element/Email.php +++ b/src/Form/Element/Email.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Email extends Text { /** diff --git a/src/Form/Element/Hidden.php b/src/Form/Element/Hidden.php index 086042c14..2a14d7b16 100644 --- a/src/Form/Element/Hidden.php +++ b/src/Form/Element/Hidden.php @@ -4,6 +4,13 @@ use PHPCensor\Form\Input; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Hidden extends Input { } diff --git a/src/Form/Element/Password.php b/src/Form/Element/Password.php index f97e49bf2..b015034dd 100644 --- a/src/Form/Element/Password.php +++ b/src/Form/Element/Password.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Password extends Text { /** diff --git a/src/Form/Element/Radio.php b/src/Form/Element/Radio.php index 6c1e386b5..cb0c427a4 100644 --- a/src/Form/Element/Radio.php +++ b/src/Form/Element/Radio.php @@ -2,6 +2,13 @@ namespace PHPCensor\Form\Element; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Radio extends Select { } diff --git a/src/Form/Element/Select.php b/src/Form/Element/Select.php index c45c86389..21d74af58 100644 --- a/src/Form/Element/Select.php +++ b/src/Form/Element/Select.php @@ -5,6 +5,13 @@ use PHPCensor\Form\Input; use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Select extends Input { /** diff --git a/src/Form/Element/Submit.php b/src/Form/Element/Submit.php index 4e6a8750a..c0373d30e 100644 --- a/src/Form/Element/Submit.php +++ b/src/Form/Element/Submit.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Submit extends Button { /** diff --git a/src/Form/Element/Text.php b/src/Form/Element/Text.php index 038846d7a..9f36fe7f6 100644 --- a/src/Form/Element/Text.php +++ b/src/Form/Element/Text.php @@ -5,6 +5,13 @@ use PHPCensor\Form\Input; use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Text extends Input { /** diff --git a/src/Form/Element/TextArea.php b/src/Form/Element/TextArea.php index b91f2c7bc..0d89a2e4a 100644 --- a/src/Form/Element/TextArea.php +++ b/src/Form/Element/TextArea.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class TextArea extends Text { /** diff --git a/src/Form/Element/Url.php b/src/Form/Element/Url.php index d46c2b839..60645ae0c 100644 --- a/src/Form/Element/Url.php +++ b/src/Form/Element/Url.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Url extends Text { /** diff --git a/src/Form/FieldSet.php b/src/Form/FieldSet.php index 996e4128f..cdaf45399 100644 --- a/src/Form/FieldSet.php +++ b/src/Form/FieldSet.php @@ -4,6 +4,13 @@ use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class FieldSet extends Element { /** diff --git a/src/Form/Input.php b/src/Form/Input.php index a13bc58ea..7fc0e1a4b 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -7,6 +7,13 @@ use PHPCensor\Form\DataTransformer\DataTransformerInterface; use PHPCensor\View; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Input extends Element { /** diff --git a/src/Form/Validator/ValidatorInterface.php b/src/Form/Validator/ValidatorInterface.php index 6e10c277f..b441929e7 100644 --- a/src/Form/Validator/ValidatorInterface.php +++ b/src/Form/Validator/ValidatorInterface.php @@ -2,6 +2,12 @@ namespace PHPCensor\Form\Validator; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ interface ValidatorInterface { public function __invoke($value); diff --git a/src/Form/Validator/Yaml.php b/src/Form/Validator/Yaml.php index c43cb8b8b..0a6650494 100644 --- a/src/Form/Validator/Yaml.php +++ b/src/Form/Validator/Yaml.php @@ -6,6 +6,12 @@ use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Parser; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Yaml implements ValidatorInterface { /** @var Parser */ diff --git a/src/Helper/Bitbucket.php b/src/Helper/Bitbucket.php index 04811f5cd..f11f54135 100644 --- a/src/Helper/Bitbucket.php +++ b/src/Helper/Bitbucket.php @@ -8,6 +8,11 @@ /** * The Bitbucket Helper class provides some Bitbucket API call functionality. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Bitbucket { diff --git a/src/Helper/Branch.php b/src/Helper/Branch.php index 3c988f95b..8421bb58e 100644 --- a/src/Helper/Branch.php +++ b/src/Helper/Branch.php @@ -4,6 +4,12 @@ use PHPCensor\Model\Project; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Branch { public static function getDefaultBranchName($projectType) diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index 672f23aa0..b6ca5ee0d 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -9,6 +9,11 @@ /** * The BuildInterpolator class replaces variables in a string with build-specific information. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class BuildInterpolator { diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index 6a688a5b4..e421b1593 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -8,6 +8,11 @@ /** * Handles running system commands with variables. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class CommandExecutor implements CommandExecutorInterface { diff --git a/src/Helper/CommandExecutorInterface.php b/src/Helper/CommandExecutorInterface.php index 379b21b33..3f72078cf 100644 --- a/src/Helper/CommandExecutorInterface.php +++ b/src/Helper/CommandExecutorInterface.php @@ -4,6 +4,12 @@ use Exception; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ interface CommandExecutorInterface { /** diff --git a/src/Helper/Diff.php b/src/Helper/Diff.php index 902c48aaa..573a68d2f 100644 --- a/src/Helper/Diff.php +++ b/src/Helper/Diff.php @@ -4,6 +4,11 @@ /** * Provides some basic diff processing functionality. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Diff { diff --git a/src/Helper/Email.php b/src/Helper/Email.php index fb64e005d..589049fd1 100644 --- a/src/Helper/Email.php +++ b/src/Helper/Email.php @@ -8,6 +8,11 @@ /** * Helper class for sending emails using email configuration. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Email { diff --git a/src/Helper/Github.php b/src/Helper/Github.php index bd093872c..fd4793186 100644 --- a/src/Helper/Github.php +++ b/src/Helper/Github.php @@ -7,6 +7,11 @@ /** * The Github Helper class provides some Github API call functionality. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Github { diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index a0779eee5..7a4f6b5a3 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -8,6 +8,11 @@ /** * Languages Helper Class - Handles loading strings files and the strings within them. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Lang { diff --git a/src/Helper/MailerFactory.php b/src/Helper/MailerFactory.php index 059d3f2bf..a1975a2e9 100644 --- a/src/Helper/MailerFactory.php +++ b/src/Helper/MailerFactory.php @@ -8,6 +8,11 @@ /** * Class MailerFactory helps to set up and configure a SwiftMailer object. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class MailerFactory { diff --git a/src/Helper/SshKey.php b/src/Helper/SshKey.php index 43ea52e08..7f30d833f 100644 --- a/src/Helper/SshKey.php +++ b/src/Helper/SshKey.php @@ -6,6 +6,11 @@ /** * Helper class for dealing with SSH keys. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class SshKey { diff --git a/src/Helper/Template.php b/src/Helper/Template.php index e1c9e8c0f..1f8c8eba0 100644 --- a/src/Helper/Template.php +++ b/src/Helper/Template.php @@ -4,6 +4,12 @@ use voku\helper\AntiXSS; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Template { /** diff --git a/src/Helper/Xml.php b/src/Helper/Xml.php index e008306e9..b9c3b8a9c 100644 --- a/src/Helper/Xml.php +++ b/src/Helper/Xml.php @@ -7,6 +7,12 @@ use LibXMLError; use SimpleXMLElement; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Xml { /** diff --git a/src/Helper/Xml/Utf8CleanFilter.php b/src/Helper/Xml/Utf8CleanFilter.php index 7b5b733be..c6d650dce 100644 --- a/src/Helper/Xml/Utf8CleanFilter.php +++ b/src/Helper/Xml/Utf8CleanFilter.php @@ -4,6 +4,12 @@ use php_user_filter; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Utf8CleanFilter extends php_user_filter { const PATTERN = '/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u'; diff --git a/src/Http/Request.php b/src/Http/Request.php index f2f8283d7..70696dc21 100644 --- a/src/Http/Request.php +++ b/src/Http/Request.php @@ -2,6 +2,13 @@ namespace PHPCensor\Http; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Request { /** diff --git a/src/Http/Response.php b/src/Http/Response.php index 25e0ad09e..af8754a30 100644 --- a/src/Http/Response.php +++ b/src/Http/Response.php @@ -2,6 +2,13 @@ namespace PHPCensor\Http; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Response { protected $data = []; diff --git a/src/Http/Response/JsonResponse.php b/src/Http/Response/JsonResponse.php index 8f35cd775..7b7a9fc1b 100644 --- a/src/Http/Response/JsonResponse.php +++ b/src/Http/Response/JsonResponse.php @@ -4,6 +4,13 @@ use PHPCensor\Http\Response; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class JsonResponse extends Response { public function __construct(Response $createFrom = null) diff --git a/src/Http/Response/RedirectResponse.php b/src/Http/Response/RedirectResponse.php index b4c8f3d5b..fb37c18d3 100644 --- a/src/Http/Response/RedirectResponse.php +++ b/src/Http/Response/RedirectResponse.php @@ -4,6 +4,13 @@ use PHPCensor\Http\Response; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class RedirectResponse extends Response { public function __construct(Response $createFrom = null) diff --git a/src/Http/Router.php b/src/Http/Router.php index 48b0649fa..50fa39c5e 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -5,6 +5,13 @@ use PHPCensor\Application; use PHPCensor\Common\Exception\InvalidArgumentException; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Router { /** diff --git a/src/Migrations/20200505070903_initial_migration_v2.php b/src/Migrations/20200505070903_initial_migration_v2.php index 279130a36..7ddae1e61 100644 --- a/src/Migrations/20200505070903_initial_migration_v2.php +++ b/src/Migrations/20200505070903_initial_migration_v2.php @@ -5,6 +5,12 @@ use PHPCensor\Model\Build; use PHPCensor\Common\Exception\RuntimeException; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class InitialMigrationV2 extends AbstractMigration { private const LATEST_V1_MIGRATION_NAME = 'FixedPhpStanPluginName'; diff --git a/src/Model.php b/src/Model.php index 365149e2a..cd2f67789 100644 --- a/src/Model.php +++ b/src/Model.php @@ -8,6 +8,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class Model diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index d93f84f52..fbe795a8a 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -10,6 +10,13 @@ use PHPCensor\Model; use PHPCensor\Store\BuildStore; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Build extends Model { const STATUS_PENDING = 0; diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index ba1c0a99b..6d6e3eddd 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -8,6 +8,13 @@ use Exception; use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class BuildError extends Model { const SEVERITY_CRITICAL = 0; diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 84c403a67..564bce41a 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -6,6 +6,13 @@ use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class BuildMeta extends Model { /** diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index d77473b70..9087304da 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -6,6 +6,12 @@ use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Environment extends Model { /** diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 9454b41d9..e38bef3de 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -9,6 +9,13 @@ use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class Project extends Model { const TYPE_LOCAL = 'local'; diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index 7a58f04ab..03e554370 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -8,6 +8,12 @@ use Exception; use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class ProjectGroup extends Model { /** diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index ebf4d1015..32e22075a 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -6,6 +6,13 @@ use PHPCensor\Model; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class User extends Model { /** diff --git a/src/Model/Build.php b/src/Model/Build.php index a9d611351..64f676655 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -19,7 +19,11 @@ use Symfony\Component\Yaml\Parser as YamlParser; /** + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Build extends BaseBuild { diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 83c353e6c..54c29b8b8 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -13,7 +13,11 @@ /** * BitBucket Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class BitbucketBuild extends GitBuild { diff --git a/src/Model/Build/BitbucketHgBuild.php b/src/Model/Build/BitbucketHgBuild.php index 77c91b8c1..6ef6348b4 100644 --- a/src/Model/Build/BitbucketHgBuild.php +++ b/src/Model/Build/BitbucketHgBuild.php @@ -7,7 +7,11 @@ /** * BitbucketHgBuild Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Artem Bochkov + * @author Dmitry Khomutov */ class BitbucketHgBuild extends HgBuild { diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index c0e66a7f9..bb0630a68 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -7,6 +7,12 @@ use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model\Build; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BitbucketServerBuild extends GitBuild { /** diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 5711f9a1a..932763c07 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -12,7 +12,11 @@ /** * Remote Git Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class GitBuild extends Build { diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 5790531fb..cc46aab20 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -13,7 +13,11 @@ /** * Github Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class GithubBuild extends GitBuild { diff --git a/src/Model/Build/GitlabBuild.php b/src/Model/Build/GitlabBuild.php index aa648a0ab..5afbb1fb1 100644 --- a/src/Model/Build/GitlabBuild.php +++ b/src/Model/Build/GitlabBuild.php @@ -5,7 +5,11 @@ /** * Gitlab Build Model * + * @package PHP Censor + * @subpackage Application + * * @author André Cianfarani + * @author Dmitry Khomutov */ class GitlabBuild extends GitBuild { diff --git a/src/Model/Build/GogsBuild.php b/src/Model/Build/GogsBuild.php index fb98d87c5..0788529d5 100644 --- a/src/Model/Build/GogsBuild.php +++ b/src/Model/Build/GogsBuild.php @@ -4,6 +4,11 @@ /** * GogsBuild Build Model + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class GogsBuild extends GitBuild { diff --git a/src/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php index 36ec6843e..d0cfd5181 100644 --- a/src/Model/Build/HgBuild.php +++ b/src/Model/Build/HgBuild.php @@ -11,7 +11,11 @@ /** * Mercurial Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Pavel Gopanenko + * @author Dmitry Khomutov */ class HgBuild extends Build { diff --git a/src/Model/Build/LocalBuild.php b/src/Model/Build/LocalBuild.php index aa0bcaaf4..e8e334a83 100644 --- a/src/Model/Build/LocalBuild.php +++ b/src/Model/Build/LocalBuild.php @@ -9,7 +9,11 @@ /** * Local Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class LocalBuild extends Build { diff --git a/src/Model/Build/SvnBuild.php b/src/Model/Build/SvnBuild.php index 826f23542..2798d97ef 100644 --- a/src/Model/Build/SvnBuild.php +++ b/src/Model/Build/SvnBuild.php @@ -9,7 +9,11 @@ /** * Remote Subversion Build Model * + * @package PHP Censor + * @subpackage Application + * * @author Nadir Dzhilkibaev + * @author Dmitry Khomutov */ class SvnBuild extends Build { diff --git a/src/Model/BuildError.php b/src/Model/BuildError.php index d37089e0f..9136ddf17 100644 --- a/src/Model/BuildError.php +++ b/src/Model/BuildError.php @@ -5,6 +5,13 @@ use PHPCensor\Model\Base\BuildError as BaseBuildError; use PHPCensor\Store\BuildStore; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class BuildError extends BaseBuildError { /** diff --git a/src/Model/BuildMeta.php b/src/Model/BuildMeta.php index 1f69edd12..c39b7542b 100644 --- a/src/Model/BuildMeta.php +++ b/src/Model/BuildMeta.php @@ -5,6 +5,13 @@ use PHPCensor\Model\Base\BuildMeta as BaseBuildMeta; use PHPCensor\Store\BuildStore; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dan Cryer + * @author Dmitry Khomutov + */ class BuildMeta extends BaseBuildMeta { /** diff --git a/src/Model/Environment.php b/src/Model/Environment.php index acac89084..a0f3ab73a 100644 --- a/src/Model/Environment.php +++ b/src/Model/Environment.php @@ -4,6 +4,12 @@ use PHPCensor\Model\Base\Environment as BaseEnvironment; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class Environment extends BaseEnvironment { } diff --git a/src/Model/Project.php b/src/Model/Project.php index 3c18bd735..58b6a5daa 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -9,7 +9,11 @@ use Symfony\Component\Yaml\Parser as YamlParser; /** + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Project extends BaseProject { diff --git a/src/Model/ProjectGroup.php b/src/Model/ProjectGroup.php index e1f21ae88..0d529321d 100644 --- a/src/Model/ProjectGroup.php +++ b/src/Model/ProjectGroup.php @@ -5,6 +5,12 @@ use PHPCensor\Model\Base\ProjectGroup as BaseProjectGroup; use PHPCensor\Store\ProjectStore; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class ProjectGroup extends BaseProjectGroup { /** diff --git a/src/Model/User.php b/src/Model/User.php index 5e4b8b372..22a5c8da8 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -6,7 +6,11 @@ use PHPCensor\Model\Base\User as BaseUser; /** + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class User extends BaseUser { diff --git a/src/Plugin/Atoum.php b/src/Plugin/Atoum.php index 3d04c3188..5edb668d5 100644 --- a/src/Plugin/Atoum.php +++ b/src/Plugin/Atoum.php @@ -8,6 +8,11 @@ /** * Atoum plugin, runs Atoum tests within a project. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Atoum extends Plugin { diff --git a/src/Plugin/Behat.php b/src/Plugin/Behat.php index 86afc1b1a..2a3337f46 100644 --- a/src/Plugin/Behat.php +++ b/src/Plugin/Behat.php @@ -10,7 +10,11 @@ /** * Behat BDD Plugin * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Behat extends Plugin { diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index 0cf7e2376..d06ef19db 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -13,6 +13,12 @@ use PHPCensor\Store\BuildMetaStore; use PHPCensor\Store\BuildStore; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BitbucketNotify extends Plugin { /** @var string */ diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index 6311d457d..6ee69ba2b 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -10,7 +10,11 @@ /** * Campfire Plugin - Allows Campfire API actions. Strongly based on icecube (http://labs.mimmin.com/icecube) * + * @package PHP Censor + * @subpackage Application + * * @author André Cianfarani + * @author Dmitry Khomutov */ class CampfireNotify extends Plugin { diff --git a/src/Plugin/CleanBuild.php b/src/Plugin/CleanBuild.php index b2c6dc9f6..1f63c756c 100644 --- a/src/Plugin/CleanBuild.php +++ b/src/Plugin/CleanBuild.php @@ -10,7 +10,11 @@ * Clean build removes Composer related files and allows users to clean up their build directory. * Useful as a precursor to copy_build. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class CleanBuild extends Plugin { diff --git a/src/Plugin/Codeception.php b/src/Plugin/Codeception.php index afafeacd5..f51ca34a3 100644 --- a/src/Plugin/Codeception.php +++ b/src/Plugin/Codeception.php @@ -14,9 +14,13 @@ /** * Codeception Plugin - Enables full acceptance, unit, and functional testing. * + * @package PHP Censor + * @subpackage Application + * * @author Don Gilbert * @author Igor Timoshenko * @author Adam Cooper + * @author Dmitry Khomutov */ class Codeception extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/Composer.php b/src/Plugin/Composer.php index ff99d9f73..b9bc4d399 100644 --- a/src/Plugin/Composer.php +++ b/src/Plugin/Composer.php @@ -11,7 +11,11 @@ /** * Composer Plugin - Provides access to Composer functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Composer extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/CopyBuild.php b/src/Plugin/CopyBuild.php index 1ec10b212..1aed9a244 100644 --- a/src/Plugin/CopyBuild.php +++ b/src/Plugin/CopyBuild.php @@ -10,7 +10,11 @@ /** * Copy Build Plugin - Copies the entire build to another directory. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class CopyBuild extends Plugin { diff --git a/src/Plugin/Deployer.php b/src/Plugin/Deployer.php index 87e05845c..e32d73b66 100644 --- a/src/Plugin/Deployer.php +++ b/src/Plugin/Deployer.php @@ -10,7 +10,11 @@ /** * Integration with Deployer: https://github.com/rebelinblue/deployer * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Deployer extends Plugin { diff --git a/src/Plugin/DeployerOrg.php b/src/Plugin/DeployerOrg.php index e2a41d0b6..2e1ac476f 100644 --- a/src/Plugin/DeployerOrg.php +++ b/src/Plugin/DeployerOrg.php @@ -9,7 +9,11 @@ /** * Deployer plugin for PHPCensor: http://deployer.org * + * @package PHP Censor + * @subpackage Application + * * @author Alexey Boyko + * @author Dmitry Khomutov */ class DeployerOrg extends Plugin { diff --git a/src/Plugin/EmailNotify.php b/src/Plugin/EmailNotify.php index 3072175fa..81fe089c6 100644 --- a/src/Plugin/EmailNotify.php +++ b/src/Plugin/EmailNotify.php @@ -12,7 +12,11 @@ /** * Email Plugin - Provides simple email capability. * + * @package PHP Censor + * @subpackage Application + * * @author Steve Brazier + * @author Dmitry Khomutov */ class EmailNotify extends Plugin { diff --git a/src/Plugin/Env.php b/src/Plugin/Env.php index 0a40893cd..fd8d2441d 100644 --- a/src/Plugin/Env.php +++ b/src/Plugin/Env.php @@ -7,7 +7,11 @@ /** * Environment variable plugin * + * @package PHP Censor + * @subpackage Application + * * @author Steve Kamerman + * @author Dmitry Khomutov */ class Env extends Plugin { diff --git a/src/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php index 495b478ac..c80a4d1bc 100644 --- a/src/Plugin/FlowdockNotify.php +++ b/src/Plugin/FlowdockNotify.php @@ -14,7 +14,11 @@ /** * Flowdock Plugin * + * @package PHP Censor + * @subpackage Application + * * @author Petr Cervenka + * @author Dmitry Khomutov */ class FlowdockNotify extends Plugin { diff --git a/src/Plugin/Git.php b/src/Plugin/Git.php index 5ee08922c..8cb3385e1 100644 --- a/src/Plugin/Git.php +++ b/src/Plugin/Git.php @@ -9,7 +9,11 @@ /** * Git plugin. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Git extends Plugin { diff --git a/src/Plugin/Grunt.php b/src/Plugin/Grunt.php index 2c85cd71d..aee2dae6c 100644 --- a/src/Plugin/Grunt.php +++ b/src/Plugin/Grunt.php @@ -9,7 +9,11 @@ /** * Grunt Plugin - Provides access to grunt functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Tobias Tom + * @author Dmitry Khomutov */ class Grunt extends Plugin { diff --git a/src/Plugin/Gulp.php b/src/Plugin/Gulp.php index 3ae09f537..05f9c52c1 100644 --- a/src/Plugin/Gulp.php +++ b/src/Plugin/Gulp.php @@ -9,7 +9,11 @@ /** * Gulp Plugin - Provides access to gulp functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Dirk Heilig + * @author Dmitry Khomutov */ class Gulp extends Plugin { diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index 480277f38..4c07af4d8 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -11,7 +11,11 @@ /** * Hipchat Plugin * + * @package PHP Censor + * @subpackage Application + * * @author James Inman + * @author Dmitry Khomutov */ class HipchatNotify extends Plugin { diff --git a/src/Plugin/IrcNotify.php b/src/Plugin/IrcNotify.php index 7aed33a0e..59d23c97e 100644 --- a/src/Plugin/IrcNotify.php +++ b/src/Plugin/IrcNotify.php @@ -9,7 +9,11 @@ /** * IRC Plugin - Sends a notification to an IRC channel * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class IrcNotify extends Plugin { diff --git a/src/Plugin/Lint.php b/src/Plugin/Lint.php index ef5e97c4e..edc8d5df2 100644 --- a/src/Plugin/Lint.php +++ b/src/Plugin/Lint.php @@ -11,7 +11,11 @@ /** * PHP Lint Plugin - Provides access to PHP lint functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Lint extends Plugin { diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 2383fedd0..09f81c83a 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -1,7 +1,4 @@ */ class Mage extends Plugin { diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index d6d38dc41..c9e62d866 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -1,7 +1,4 @@ */ class Mage3 extends Plugin { diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 8c79eb741..2ee4bba6e 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -13,8 +13,12 @@ /** * MySQL Plugin - Provides access to a MySQL database. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer * @author Steve Kamerman + * @author Dmitry Khomutov */ class Mysql extends Plugin { diff --git a/src/Plugin/Option/PhpUnitOptions.php b/src/Plugin/Option/PhpUnitOptions.php index be7ebe43f..053e8a18f 100644 --- a/src/Plugin/Option/PhpUnitOptions.php +++ b/src/Plugin/Option/PhpUnitOptions.php @@ -7,7 +7,11 @@ /** * Class PhpUnitOptions validates and parse the option for the PhpUnitV2 plugin * + * @package PHP Censor + * @subpackage Application + * * @author Pablo Tejada + * @author Dmitry Khomutov */ class PhpUnitOptions { diff --git a/src/Plugin/PackageBuild.php b/src/Plugin/PackageBuild.php index 0fdd586a9..40cdd50a0 100644 --- a/src/Plugin/PackageBuild.php +++ b/src/Plugin/PackageBuild.php @@ -9,7 +9,11 @@ /** * Create a ZIP or TAR.GZ archive of the entire build. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PackageBuild extends Plugin { diff --git a/src/Plugin/Pahout.php b/src/Plugin/Pahout.php index 999f28ec2..f66c10f19 100644 --- a/src/Plugin/Pahout.php +++ b/src/Plugin/Pahout.php @@ -10,8 +10,12 @@ use PHPCensor\Plugin; /** - * A pair programming partner for writing better PHP. - * https://github.com/wata727/pahout + * A pair programming partner for writing better PHP. https://github.com/wata727/pahout + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Pahout extends Plugin { diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index c323f30d1..3c6a3d844 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -11,7 +11,11 @@ /** * Pdepend Plugin - Allows Pdepend report * + * @package PHP Censor + * @subpackage Application + * * @author Johan van der Heide + * @author Dmitry Khomutov */ class Pdepend extends Plugin { diff --git a/src/Plugin/Pgsql.php b/src/Plugin/Pgsql.php index 2758c04b3..da1100499 100644 --- a/src/Plugin/Pgsql.php +++ b/src/Plugin/Pgsql.php @@ -11,7 +11,11 @@ /** * PgSQL Plugin - Provides access to a PgSQL database. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class Pgsql extends Plugin { diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index aece52d7d..b2083ac02 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -11,6 +11,11 @@ /** * Launch Phan. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Phan extends Plugin { diff --git a/src/Plugin/Phar.php b/src/Plugin/Phar.php index 11a729158..4ea354a1b 100644 --- a/src/Plugin/Phar.php +++ b/src/Plugin/Phar.php @@ -10,6 +10,11 @@ /** * Phar Plugin + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Phar extends Plugin { diff --git a/src/Plugin/Phing.php b/src/Plugin/Phing.php index dc987940e..72d9f35ab 100644 --- a/src/Plugin/Phing.php +++ b/src/Plugin/Phing.php @@ -11,7 +11,11 @@ /** * Phing Plugin - Provides access to Phing functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Pavel Pavlov + * @author Dmitry Khomutov */ class Phing extends Plugin { diff --git a/src/Plugin/Phlint.php b/src/Plugin/Phlint.php index 3f015c33b..9711542f7 100644 --- a/src/Plugin/Phlint.php +++ b/src/Plugin/Phlint.php @@ -14,6 +14,11 @@ * issues. It focuses on how the code works rather than how the code looks. Phlint is designed from the start to do * deep semantic analysis rather than doing only shallow or stylistic analysis. * https://gitlab.com/phlint/phlint + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Phlint extends Plugin { diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index 55052f15e..65ce83dbe 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -14,7 +14,11 @@ /** * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php index b0cfb370a..d1b2775a7 100644 --- a/src/Plugin/PhpCpd.php +++ b/src/Plugin/PhpCpd.php @@ -13,7 +13,11 @@ /** * PHP Copy / Paste Detector - Allows PHP Copy / Paste Detector testing. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PhpCpd extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index d190e8795..432f2d81c 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -15,7 +15,11 @@ /** * PHP CS Fixer - Works with the PHP Coding Standards Fixer for testing coding standards. * + * @package PHP Censor + * @subpackage Application + * * @author Gabriel Baker + * @author Dmitry Khomutov */ class PhpCsFixer extends Plugin { diff --git a/src/Plugin/PhpDocblockChecker.php b/src/Plugin/PhpDocblockChecker.php index e9a4abeee..f6ae90d55 100644 --- a/src/Plugin/PhpDocblockChecker.php +++ b/src/Plugin/PhpDocblockChecker.php @@ -12,7 +12,11 @@ /** * PHP Docblock Checker Plugin - Checks your PHP files for appropriate uses of Docblocks * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PhpDocblockChecker extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpLoc.php b/src/Plugin/PhpLoc.php index 8a17687ad..2efe4473a 100644 --- a/src/Plugin/PhpLoc.php +++ b/src/Plugin/PhpLoc.php @@ -11,7 +11,11 @@ /** * PHP Loc - Allows PHP Copy / Lines of Code testing. * + * @package PHP Censor + * @subpackage Application + * * @author Johan van der Heide + * @author Dmitry Khomutov */ class PhpLoc extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index 785571644..74d37953d 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -13,7 +13,11 @@ /** * PHP Mess Detector Plugin - Allows PHP Mess Detector testing. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PhpMessDetector extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpParallelLint.php b/src/Plugin/PhpParallelLint.php index 2c8ef1c2a..d3f49752d 100644 --- a/src/Plugin/PhpParallelLint.php +++ b/src/Plugin/PhpParallelLint.php @@ -10,7 +10,11 @@ /** * Php Parallel Lint Plugin - Provides access to PHP lint functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Vaclav Makes + * @author Dmitry Khomutov */ class PhpParallelLint extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/PhpSpec.php b/src/Plugin/PhpSpec.php index 84a245cad..4c06a3214 100644 --- a/src/Plugin/PhpSpec.php +++ b/src/Plugin/PhpSpec.php @@ -10,7 +10,11 @@ /** * PHP Spec Plugin - Allows PHP Spec testing. * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer + * @author Dmitry Khomutov */ class PhpSpec extends Plugin { diff --git a/src/Plugin/PhpStan.php b/src/Plugin/PhpStan.php index 54d93cd56..396b72d8e 100644 --- a/src/Plugin/PhpStan.php +++ b/src/Plugin/PhpStan.php @@ -14,6 +14,11 @@ * before you write tests for the code. It moves PHP closer to compiled languages in the sense that the correctness of * each line of the code can be checked before you run the actual line. * https://github.com/phpstan/phpstan + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class PhpStan extends Plugin { diff --git a/src/Plugin/PhpTalLint.php b/src/Plugin/PhpTalLint.php index 11296741d..d7ecedaf1 100644 --- a/src/Plugin/PhpTalLint.php +++ b/src/Plugin/PhpTalLint.php @@ -11,7 +11,11 @@ /** * PHPTAL Lint Plugin - Provides access to PHPTAL lint functionality. * + * @package PHP Censor + * @subpackage Application + * * @author Stephen Ball + * @author Dmitry Khomutov */ class PhpTalLint extends Plugin { diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index 7fea1f0c1..4fff1a807 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -18,8 +18,12 @@ /** * PHP Unit Plugin - A rewrite of the original PHP Unit plugin * + * @package PHP Censor + * @subpackage Application + * * @author Dan Cryer * @author Pablo Tejada + * @author Dmitry Khomutov */ class PhpUnit extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/Psalm.php b/src/Plugin/Psalm.php index 25b9dc452..64adf2ea4 100644 --- a/src/Plugin/Psalm.php +++ b/src/Plugin/Psalm.php @@ -11,6 +11,11 @@ /** * A static analysis tool for finding errors in PHP applications https://getpsalm.org + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Psalm extends Plugin { diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index 35578fc52..2ed0e6189 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -13,6 +13,9 @@ /** * SensioLabs Security Checker Plugin * + * @package PHP Censor + * @subpackage Application + * * @author Dmitry Khomutov */ class SecurityChecker extends Plugin implements ZeroConfigPluginInterface diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index 65019a363..db8747e00 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -12,7 +12,11 @@ /** * Sensiolabs Insight Plugin - Allows Sensiolabs Insight testing. * + * @package PHP Censor + * @subpackage Application + * * @author Eugen Ganshorn + * @author Dmitry Khomutov */ class SensiolabsInsight extends Plugin { diff --git a/src/Plugin/Shell.php b/src/Plugin/Shell.php index 2a8fe6c94..242665436 100644 --- a/src/Plugin/Shell.php +++ b/src/Plugin/Shell.php @@ -9,7 +9,11 @@ /** * Shell Plugin - Allows execute shell commands. * + * @package PHP Censor + * @subpackage Application + * * @author Kinn Coelho Julião + * @author Dmitry Khomutov */ class Shell extends Plugin { diff --git a/src/Plugin/SlackNotify.php b/src/Plugin/SlackNotify.php index fc7511e87..724fd41e9 100644 --- a/src/Plugin/SlackNotify.php +++ b/src/Plugin/SlackNotify.php @@ -13,7 +13,11 @@ /** * Slack Plugin * + * @package PHP Censor + * @subpackage Application + * * @author Stephen Ball + * @author Dmitry Khomutov */ class SlackNotify extends Plugin { diff --git a/src/Plugin/Sqlite.php b/src/Plugin/Sqlite.php index a9730a2f9..ccaf21c5b 100644 --- a/src/Plugin/Sqlite.php +++ b/src/Plugin/Sqlite.php @@ -11,6 +11,9 @@ /** * SQLite Plugin — Provides access to a SQLite database. * + * @package PHP Censor + * @subpackage Application + * * @author Dmitry Khomutov */ class Sqlite extends Plugin diff --git a/src/Plugin/TechnicalDebt.php b/src/Plugin/TechnicalDebt.php index 230310906..5b5d7f6c9 100644 --- a/src/Plugin/TechnicalDebt.php +++ b/src/Plugin/TechnicalDebt.php @@ -14,7 +14,11 @@ /** * Technical Debt Plugin - Checks for existence of "TODO", "FIXME", etc. * + * @package PHP Censor + * @subpackage Application + * * @author James Inman + * @author Dmitry Khomutov */ class TechnicalDebt extends Plugin implements ZeroConfigPluginInterface { diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index c1d0594e8..d9d706014 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -12,7 +12,11 @@ /** * Telegram Plugin * + * @package PHP Censor + * @subpackage Application + * * @author LEXASOFT + * @author Dmitry Khomutov */ class TelegramNotify extends Plugin { diff --git a/src/Plugin/Util/BitbucketNotifyPhpUnitResult.php b/src/Plugin/Util/BitbucketNotifyPhpUnitResult.php index e5352d5ac..b30f70738 100644 --- a/src/Plugin/Util/BitbucketNotifyPhpUnitResult.php +++ b/src/Plugin/Util/BitbucketNotifyPhpUnitResult.php @@ -2,6 +2,12 @@ namespace PHPCensor\Plugin\Util; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BitbucketNotifyPhpUnitResult extends BitbucketNotifyPluginResult { public function __construct($plugin, $left, $right) diff --git a/src/Plugin/Util/BitbucketNotifyPluginResult.php b/src/Plugin/Util/BitbucketNotifyPluginResult.php index 0f1b5b419..8d3625f56 100644 --- a/src/Plugin/Util/BitbucketNotifyPluginResult.php +++ b/src/Plugin/Util/BitbucketNotifyPluginResult.php @@ -2,6 +2,12 @@ namespace PHPCensor\Plugin\Util; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov + */ class BitbucketNotifyPluginResult { const DEFAULT_PLUGIN_OUTPUT_FORMAT = "%s | %d\t=> %d\t%s"; diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 5be3dde5e..31e90e787 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -13,6 +13,11 @@ /** * Plugin Executor - Runs the configured plugins for a given build stage. + * + * @package PHP Censor + * @subpackage Application + * + * @author Dmitry Khomutov */ class Executor { diff --git a/src/Plugin/Util/PhpUnitResult.php b/src/Plugin/Util/PhpUnitResult.php index 61dab59c2..6d064a5bf 100644 --- a/src/Plugin/Util/PhpUnitResult.php +++ b/src/Plugin/Util/PhpUnitResult.php @@ -7,7 +7,11 @@ /** * Class PhpUnitResult parses the results for the PhpUnitV2 plugin * + * @package PHP Censor + * @subpackage Application + * * @author Pablo Tejada + * @author Dmitry Khomutov */ abstract class PhpUnitResult { diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index 645ac0f9c..9088a9736 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -8,7 +8,11 @@ /** * Class PhpUnitResult parses the results for the PhpUnitV2 plugin * + * @package PHP Censor + * @subpackage Application + * * @author Pablo Tejada + * @author Dmitry Khomutov */ class PhpUnitResultJson extends PhpUnitResult { diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index 9dace242e..330244c1e 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -10,7 +10,11 @@ /** * Class PhpUnitResultJunit parses the results for the PhpUnitV2 plugin * + * @package PHP Censor + * @subpackage Application + * * @author Simon Heimberg + * @author Dmitry Khomutov */ class PhpUnitResultJunit extends PhpUnitResult { diff --git a/src/Plugin/Util/TestResultParsers/Codeception.php b/src/Plugin/Util/TestResultParsers/Codeception.php index f0ff92ad4..9ffced3b3 100644 --- a/src/Plugin/Util/TestResultParsers/Codeception.php +++ b/src/Plugin/Util/TestResultParsers/Codeception.php @@ -8,7 +8,11 @@ /** * Class Codeception * - * @author Adam Cooper + * @package PHP Censor + * @subpackage Application + * + * @author Adam Cooper + * @author Dmitry Khomutov */ class Codeception implements ParserInterface { diff --git a/src/Plugin/Util/TestResultParsers/ParserInterface.php b/src/Plugin/Util/TestResultParsers/ParserInterface.php index ccd2d1eac..ecb08c977 100644 --- a/src/Plugin/Util/TestResultParsers/ParserInterface.php +++ b/src/Plugin/Util/TestResultParsers/ParserInterface.php @@ -2,6 +2,13 @@ namespace PHPCensor\Plugin\Util\TestResultParsers; +/** + * @package PHP Censor + * @subpackage Application + * + * @author Adam Cooper + * @author Dmitry Khomutov + */ interface ParserInterface { /** diff --git a/src/Plugin/WebhookNotify.php b/src/Plugin/WebhookNotify.php index d4558ffd8..10aad043a 100644 --- a/src/Plugin/WebhookNotify.php +++ b/src/Plugin/WebhookNotify.php @@ -14,7 +14,11 @@ /** * Webhook notify Plugin * + * @package PHP Censor + * @subpackage Application + * * @author Lee Willis (Ademti Software) : https://www.ademti-software.co.uk + * @author Dmitry Khomutov */ class WebhookNotify extends Plugin { diff --git a/src/Plugin/Wipe.php b/src/Plugin/Wipe.php index ba4593c1f..3626d0a35 100644 --- a/src/Plugin/Wipe.php +++ b/src/Plugin/Wipe.php @@ -9,7 +9,11 @@ /** * Wipe Plugin - Wipes a folder * + * @package PHP Censor + * @subpackage Application + * * @author Claus Due + * @author Dmitry Khomutov */ class Wipe extends Plugin { diff --git a/src/Plugin/XmppNotify.php b/src/Plugin/XmppNotify.php index 8da1bc229..318acfd93 100644 --- a/src/Plugin/XmppNotify.php +++ b/src/Plugin/XmppNotify.php @@ -9,7 +9,11 @@ /** * XMPP Notification - Send notification for successful or failure build * + * @package PHP Censor + * @subpackage Application + * * @author Alexandre Russo + * @author Dmitry Khomutov */ class XmppNotify extends Plugin { diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 6ce551e8a..f57b52932 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -29,6 +29,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildService diff --git a/src/Service/BuildStatusService.php b/src/Service/BuildStatusService.php index 58b9d79c9..555a56aa2 100644 --- a/src/Service/BuildStatusService.php +++ b/src/Service/BuildStatusService.php @@ -12,6 +12,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildStatusService diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index 40bb617fc..8892476f3 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -17,6 +17,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class ProjectService diff --git a/src/Service/UserService.php b/src/Service/UserService.php index 90b36d29e..e5aa05144 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -14,6 +14,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class UserService diff --git a/src/Store.php b/src/Store.php index 16ddd0efb..6b858d9d9 100644 --- a/src/Store.php +++ b/src/Store.php @@ -13,6 +13,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ abstract class Store diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 672d00519..7d5332991 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -14,6 +14,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildErrorStore extends Store diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index fe6ec248d..eb0457bb9 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -14,6 +14,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildErrorWriter diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index cdaceb657..4d23cb72b 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -13,6 +13,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildMetaStore extends Store diff --git a/src/View.php b/src/View.php index fdcd7af85..1c80ace75 100644 --- a/src/View.php +++ b/src/View.php @@ -10,6 +10,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class View diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 848649371..1d4ff8d84 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -23,6 +23,7 @@ * @package PHP Censor * @subpackage Application * + * @author Dan Cryer * @author Dmitry Khomutov */ class BuildWorker From 4a34b0744069b1890cdcd7484a3db0775e612574 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:13:54 +0700 Subject: [PATCH 020/212] Types for stores. --- src/Form.php | 42 +++++++------------------- src/Store.php | 2 +- src/Store/BuildErrorStore.php | 38 ++++++++++++------------ src/Store/BuildErrorWriter.php | 35 ++++++++++------------ src/Store/BuildMetaStore.php | 18 ++++++------ src/Store/BuildStore.php | 52 ++++++++++++++++----------------- src/Store/EnvironmentStore.php | 16 +++++----- src/Store/ProjectGroupStore.php | 18 ++++++------ src/Store/ProjectStore.php | 23 +++++++-------- src/Store/UserStore.php | 22 +++++++------- 10 files changed, 121 insertions(+), 145 deletions(-) diff --git a/src/Form.php b/src/Form.php index ef9905b96..22b679370 100644 --- a/src/Form.php +++ b/src/Form.php @@ -1,5 +1,7 @@ action; } - /** - * @param string $action - */ - public function setAction($action) + public function setAction(string $action): void { $this->action = $action; } - /** - * @return string - */ - public function getMethod() + public function getMethod(): string { return $this->method; } - /** - * @param string $method - */ - public function setMethod($method) + public function setMethod(string $method): void { $this->method = $method; } - /** - * @param View $view - */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { $view->action = $this->getAction(); $view->method = $this->getMethod(); @@ -66,10 +47,7 @@ protected function onPreRender(View &$view) parent::onPreRender($view); } - /** - * @return string - */ - public function __toString() + public function __toString(): string { return $this->render(); } diff --git a/src/Store.php b/src/Store.php index 6b858d9d9..f3c10e27d 100644 --- a/src/Store.php +++ b/src/Store.php @@ -28,7 +28,7 @@ abstract class Store protected StoreRegistry $storeRegistry; - abstract public function getByPrimaryKey($key, string $useConnection = 'read'): ?Model; + abstract public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?Model; /** * @throws RuntimeException diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index 7d5332991..60f94e4e0 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -26,14 +26,14 @@ class BuildErrorStore extends Store protected ?string $primaryKey = 'id'; /** - * @param mixed $key + * @param int $key * @param string $useConnection * * @return BuildError|null * * @throws HttpException */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildError + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?BuildError { return $this->getById($key, $useConnection); } @@ -41,14 +41,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildErr /** * Get a single BuildError by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return null|BuildError * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?BuildError { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -81,7 +81,7 @@ public function getById($id, $useConnection = 'read') * * @throws HttpException */ - public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = null, $severity = null, $isNew = null) + public function getByBuildId(int $buildId, ?int $limit = null, int $offset = 0, ?string $plugin = null, ?int $severity = null, ?string $isNew = null): array { if (\is_null($buildId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -151,7 +151,7 @@ public function getByBuildId($buildId, $limit = null, $offset = 0, $plugin = nul * * @throws Exception */ - public function getErrorTotalForBuild($buildId, $plugin = null, $severity = null, $isNew = null) + public function getErrorTotalForBuild(int $buildId, ?string $plugin = null, ?int $severity = null, ?string $isNew = null): int { $query = 'SELECT COUNT(*) AS {{total}} FROM {{' . $this->tableName . '}} WHERE {{build_id}} = :build'; @@ -191,13 +191,13 @@ public function getErrorTotalForBuild($buildId, $plugin = null, $severity = null } /** - * @param int $buildId - * @param int $severity - * @param string $isNew + * @param int $buildId + * @param int|null $severity + * @param string|null $isNew * * @return array */ - public function getKnownPlugins($buildId, $severity = null, $isNew = '') + public function getKnownPlugins(int $buildId, ?int $severity = null, ?string $isNew = null): array { $query = 'SELECT DISTINCT {{plugin}} from {{' . $this->tableName . '}} WHERE {{build_id}} = :build'; @@ -230,13 +230,13 @@ public function getKnownPlugins($buildId, $severity = null, $isNew = '') } /** - * @param int $buildId - * @param string $plugin - * @param string $isNew + * @param int $buildId + * @param string|null $plugin + * @param string|null $isNew * * @return array */ - public function getKnownSeverities($buildId, $plugin = '', $isNew = '') + public function getKnownSeverities(int $buildId, ?string $plugin = null, ?string $isNew = null): array { $query = 'SELECT DISTINCT {{severity}} FROM {{' . $this->tableName . '}} WHERE {{build_id}} = :build'; @@ -278,7 +278,7 @@ public function getKnownSeverities($buildId, $plugin = '', $isNew = '') * @return bool * @throws Exception */ - public function getIsNewError($projectId, $hash) + public function getIsNewError(int $projectId, string $hash): bool { $query = ' SELECT COUNT(*) AS {{total}} FROM {{' . $this->tableName . '}} AS be @@ -301,11 +301,13 @@ public function getIsNewError($projectId, $hash) } /** - * @param $buildId + * @param int $buildId + * * @return array + * * @throws Exception */ - public function getErrorAmountPerPluginForBuild($buildId) + public function getErrorAmountPerPluginForBuild(int $buildId): array { $query = ' SELECT {{plugin}}, COUNT(*) AS {{amount}} diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index eb0457bb9..5c481e1a3 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -59,9 +59,6 @@ public function __construct( $this->storeRegistry = $storeRegistry; } - /** - * Destructor - */ public function __destruct() { $this->flush(); @@ -70,23 +67,23 @@ public function __destruct() /** * Write error * - * @param string $plugin - * @param string $message - * @param int $severity - * @param string $file - * @param int $lineStart - * @param int $lineEnd - * @param DateTime $createdDate + * @param string $plugin + * @param string $message + * @param int $severity + * @param string|null $file + * @param int|null $lineStart + * @param int|null $lineEnd + * @param DateTime|null $createdDate */ public function write( - $plugin, - $message, - $severity, - $file = null, - $lineStart = null, - $lineEnd = null, - $createdDate = null - ) { + string $plugin, + string $message, + int $severity, + ?string $file = null, + ?int $lineStart = null, + ?int $lineEnd = null, + ?DateTime $createdDate = null + ): void { if (\is_null($createdDate)) { $createdDate = new DateTime(); } @@ -115,7 +112,7 @@ public function write( /** * Flush buffer */ - public function flush() + public function flush(): void { if (empty($this->errors)) { return; diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 4d23cb72b..4fced24cf 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -27,12 +27,12 @@ class BuildMetaStore extends Store /** * Get a BuildMeta by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return null|BuildMeta */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildMeta + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?BuildMeta { return $this->getById($key, $useConnection); } @@ -40,14 +40,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?BuildMet /** * Get a single BuildMeta by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return null|BuildMeta * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?BuildMeta { if (\is_null($id)) { throw new HttpException('id passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -74,7 +74,7 @@ public function getById($id, $useConnection = 'read') * * @throws HttpException */ - public function getByKey($buildId, $key) + public function getByKey(int $buildId, string $key): ?BuildMeta { if (\is_null($buildId)) { throw new HttpException('buildId passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -109,7 +109,7 @@ public function getByKey($buildId, $key) * * @throws HttpException */ - public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') + public function getByBuildId(int $buildId, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($buildId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -143,7 +143,7 @@ public function getByBuildId($buildId, $limit = 1000, $useConnection = 'read') * * @return array */ - public function getErrorsForUpgrade($limit) + public function getErrorsForUpgrade(int $limit): array { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{meta_key}} IN (\'phpmd-data\', \'phpcs-data\', \'phpdoccheck-data\', \'technical_debt-data\') diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 900c6d638..34eb7418e 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -29,12 +29,12 @@ class BuildStore extends Store /** * Get a Build by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return null|Build */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?Build + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?Build { return $this->getById($key, $useConnection); } @@ -42,14 +42,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Build /** * Get a single Build by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return Build|null * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?Build { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -79,7 +79,7 @@ public function getById($id, $useConnection = 'read') * * @throws HttpException */ - public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read') + public function getByProjectId(int $projectId, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -117,7 +117,7 @@ public function getByProjectId($projectId, $limit = 1000, $useConnection = 'read * * @throws HttpException */ - public function getByStatus($status, $limit = 1000, $useConnection = 'read') + public function getByStatus(int $status, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($status)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -150,7 +150,7 @@ public function getByStatus($status, $limit = 1000, $useConnection = 'read') * * @return array */ - public function getBuilds($limit = 5, $offset = 0) + public function getBuilds(int $limit = 5, int $offset = 0): array { $query = 'SELECT * FROM {{' . $this->tableName . '}} ORDER BY {{id}} DESC LIMIT :limit OFFSET :offset'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -179,7 +179,7 @@ public function getBuilds($limit = 5, $offset = 0) * * @throws Exception */ - public function getLatestBuildByProjectAndBranch($projectId, $branch) + public function getLatestBuildByProjectAndBranch(int $projectId, string $branch): ?Build { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id AND {{branch}} = :branch ORDER BY {{id}} DESC'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -197,14 +197,14 @@ public function getLatestBuildByProjectAndBranch($projectId, $branch) /** * Return an array of the latest builds for a given project. * - * @param int $projectId - * @param int $limit + * @param int|null $projectId + * @param int $limit * * @return array * * @throws Exception */ - public function getLatestBuilds($projectId = null, $limit = 5) + public function getLatestBuilds(?int $projectId = null, int $limit = 5): array { if (!\is_null($projectId)) { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :pid ORDER BY {{id}} DESC LIMIT :limit'; @@ -238,9 +238,9 @@ public function getLatestBuilds($projectId = null, $limit = 5) * @param int|null $projectId * @param int $status * - * @return array|Build + * @return Build|null */ - public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_SUCCESS) + public function getLastBuildByStatus(?int $projectId = null, int $status = Build::STATUS_SUCCESS): ?Build { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :pid AND {{status}} = :status ORDER BY {{id}} DESC LIMIT 1'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -252,7 +252,7 @@ public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_ return new Build($this->storeRegistry, $data); } } else { - return []; + return null; } } @@ -264,7 +264,7 @@ public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_ * * @return array */ - public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) + public function getAllProjectsLatestBuilds(int $limitByProject = 5, int $limitAll = 10): array { // don't fetch log field - contain many data $query = ' @@ -354,7 +354,7 @@ public function getAllProjectsLatestBuilds($limitByProject = 5, $limitAll = 10) * * @return array */ - public function getByProjectAndCommit($projectId, $commitId) + public function getByProjectAndCommit(int $projectId, string $commitId): array { $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id AND {{commit_id}} = :commit_id'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -386,7 +386,7 @@ public function getByProjectAndCommit($projectId, $commitId) * * @throws Exception */ - public function getBuildBranches($projectId) + public function getBuildBranches(int $projectId): array { $query = 'SELECT DISTINCT {{branch}} FROM {{' . $this->tableName . '}} WHERE {{project_id}} = :project_id'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -410,7 +410,7 @@ public function getBuildBranches($projectId) * * @return array|null */ - public function getMeta($key, $projectId, $buildId = null, $branch = null, $numResults = 1) + public function getMeta(string $key, int $projectId, ?int $buildId = null, ?string $branch = null, int $numResults = 1): ?array { $query = 'SELECT bm.build_id, bm.meta_key, bm.meta_value FROM {{build_metas}} AS {{bm}} @@ -482,7 +482,7 @@ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numR * @param string $key * @param string $value */ - public function setMeta($buildId, $key, $value) + public function setMeta(int $buildId, string $key, string $value): void { /** @var BuildMetaStore $store */ $store = $this->storeRegistry->get('BuildMeta'); @@ -497,7 +497,7 @@ public function setMeta($buildId, $key, $value) $store->save($meta); } - public function deleteAllByProject($projectId) + public function deleteAllByProject(int $projectId): int { $q = $this->databaseManager->getConnection('write') ->prepare( @@ -517,7 +517,7 @@ public function deleteAllByProject($projectId) * * @throws HttpException */ - public function getOldByProject($projectId, $keep = 100) + public function getOldByProject(int $projectId, int $keep = 100): array { if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -551,7 +551,7 @@ public function getOldByProject($projectId, $keep = 100) * * @throws Exception */ - public function getNewErrorsCount($buildId) + public function getNewErrorsCount(int $buildId): int { $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_errors}} WHERE {{build_id}} = :build_id AND {{is_new}} = true'; @@ -575,7 +575,7 @@ public function getNewErrorsCount($buildId) * * @throws Exception */ - public function getErrorsCount($buildId) + public function getErrorsCount(int $buildId): int { $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_errors}} WHERE {{build_id}} = :build_id'; @@ -601,7 +601,7 @@ public function getErrorsCount($buildId) * * @throws Exception */ - public function getBuildErrorsTrend($buildId, $projectId, $branch) + public function getBuildErrorsTrend(int $buildId, int $projectId, string $branch): array { $query = ' SELECT b.id AS {{build_id}}, count(be.id) AS {{count}} FROM {{' . $this->tableName . '}} AS b diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index abe30e9b9..3593fa139 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -27,12 +27,12 @@ class EnvironmentStore extends Store /** * Get a Environment by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return null|Environment */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?Environment + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?Environment { return $this->getById($key, $useConnection); } @@ -40,14 +40,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Environm /** * Get a single Environment by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return null|Environment * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?Environment { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -77,7 +77,7 @@ public function getById($id, $useConnection = 'read') * * @throws HttpException */ - public function getByNameAndProjectId($name, $projectId, $useConnection = 'read') + public function getByNameAndProjectId(string $name, int $projectId, string $useConnection = 'read'): ?Environment { if (\is_null($name)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -107,7 +107,7 @@ public function getByNameAndProjectId($name, $projectId, $useConnection = 'read' * * @throws Exception */ - public function getByProjectId($projectId, $useConnection = 'read') + public function getByProjectId(int $projectId, string $useConnection = 'read'): array { if (\is_null($projectId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); diff --git a/src/Store/ProjectGroupStore.php b/src/Store/ProjectGroupStore.php index b70ef0361..1fcb94abd 100644 --- a/src/Store/ProjectGroupStore.php +++ b/src/Store/ProjectGroupStore.php @@ -26,12 +26,12 @@ class ProjectGroupStore extends Store /** * Get a ProjectGroup by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return null|ProjectGroup */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?ProjectGroup + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?ProjectGroup { return $this->getById($key, $useConnection); } @@ -39,14 +39,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?ProjectG /** * Get a single ProjectGroup by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return ProjectGroup|null * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?ProjectGroup { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -69,14 +69,14 @@ public function getById($id, $useConnection = 'read') /** * Get a single ProjectGroup by title. * - * @param int $title - * @param string $useConnection + * @param string $title + * @param string $useConnection * * @return ProjectGroup|null * * @throws HttpException */ - public function getByTitle($title, $useConnection = 'read') + public function getByTitle(string $title, string $useConnection = 'read'): ?ProjectGroup { if (\is_null($title)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index d6b1185c1..306f33430 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -28,12 +28,12 @@ class ProjectStore extends Store /** * Get a Project by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return Project|null */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?Project + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?Project { return $this->getById($key, $useConnection); } @@ -41,14 +41,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?Project /** * Get a single Project by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return Project|null * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?Project { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -77,7 +77,7 @@ public function getById($id, $useConnection = 'read') * * @return Project[] */ - public function getByIds($values, $useConnection = 'read') + public function getByIds(array $values, string $useConnection = 'read'): array { if (empty($values)) { throw new HttpException('Values passed to ' . __FUNCTION__ . ' cannot be empty.'); @@ -107,13 +107,12 @@ public function getByIds($values, $useConnection = 'read') * * @throws HttpException */ - public function getByTitle($title, $limit = 1000, $useConnection = 'read') + public function getByTitle(string $title, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($title)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $query = 'SELECT * FROM {{' . $this->tableName . '}} WHERE {{title}} = :title LIMIT :limit'; $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $title); @@ -142,7 +141,7 @@ public function getByTitle($title, $limit = 1000, $useConnection = 'read') * * @return array */ - public function getKnownBranches($projectId) + public function getKnownBranches(int $projectId): array { $query = 'SELECT {{branch}}, COUNT(1) AS {{count}} from {{builds}} WHERE {{project_id}} = :pid GROUP BY {{branch}} ORDER BY {{count}} DESC'; $stmt = $this->databaseManager->getConnection('read')->prepare($query); @@ -168,7 +167,7 @@ public function getKnownBranches($projectId) * * @return array */ - public function getAll($archived = false) + public function getAll(bool $archived = false): array { $archived = (int)$archived; @@ -206,7 +205,7 @@ public function getAll($archived = false) * * @throws Exception */ - public function getByGroupId($groupId, $archived = false, $limit = 1000, $useConnection = 'read') + public function getByGroupId(int $groupId, bool $archived = false, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($groupId)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index 625538969..30f0c3341 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -27,12 +27,12 @@ class UserStore extends Store /** * Get a User by primary key (Id) * - * @param int $key - * @param string $useConnection + * @param int $key + * @param string $useConnection * * @return null|User */ - public function getByPrimaryKey($key, string $useConnection = 'read'): ?User + public function getByPrimaryKey(int $key, string $useConnection = 'read'): ?User { return $this->getById($key, $useConnection); } @@ -40,14 +40,14 @@ public function getByPrimaryKey($key, string $useConnection = 'read'): ?User /** * Get a single User by Id. * - * @param int $id - * @param string $useConnection + * @param int $id + * @param string $useConnection * * @return null|User * * @throws HttpException */ - public function getById($id, $useConnection = 'read') + public function getById(int $id, string $useConnection = 'read'): ?User { if (\is_null($id)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -73,9 +73,9 @@ public function getById($id, $useConnection = 'read') * * @throws HttpException * - * @return User + * @return User|null */ - public function getByEmail($email) + public function getByEmail(string $email): ?User { if (\is_null($email)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -104,7 +104,7 @@ public function getByEmail($email) * * @return User */ - public function getByEmailOrName($emailOrName) + public function getByEmailOrName(string $emailOrName): ?User { if (\is_null($emailOrName)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -132,7 +132,7 @@ public function getByEmailOrName($emailOrName) * * @return User */ - public function getByRememberKey($rememberKey) + public function getByRememberKey(string $rememberKey): ?User { if (\is_null($rememberKey)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); @@ -162,7 +162,7 @@ public function getByRememberKey($rememberKey) * * @throws HttpException */ - public function getByName($name, $limit = 1000, $useConnection = 'read') + public function getByName(string $name, int $limit = 1000, string $useConnection = 'read'): array { if (\is_null($name)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); From cb84995a115890d5be2dc370532a2dbd7189f9df Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:14:15 +0700 Subject: [PATCH 021/212] Types for services. --- src/Service/BuildService.php | 39 +++++++++++++------------ src/Service/BuildStatusService.php | 46 ++++++++++++++++++------------ src/Service/ProjectService.php | 18 ++++++------ src/Service/UserService.php | 6 ++-- 4 files changed, 59 insertions(+), 50 deletions(-) diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index f57b52932..fb30359b4 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -64,24 +64,24 @@ public function __construct( * @param string|null $tag * @param string|null $committerEmail * @param string|null $commitMessage - * @param int $source - * @param int $userId + * @param int $source + * @param int $userId * @param array|null $extra * * @return Build */ public function createBuild( Project $project, - $environmentId = null, - $commitId = '', - $branch = null, - $tag = null, - $committerEmail = null, - $commitMessage = null, - $source = Build::SOURCE_UNKNOWN, - $userId = null, - $extra = null - ) { + ?int $environmentId = null, + string $commitId = '', + ?string $branch = null, + ?string $tag = null, + ?string $committerEmail = null, + ?string $commitMessage = null, + int $source = Build::SOURCE_UNKNOWN, + int $userId = null, + ?array $extra = null + ): Build { $build = new Build($this->storeRegistry); $build->setCreateDate(new DateTime()); $build->setProjectId($project->getId()); @@ -143,7 +143,7 @@ public function createBuild( * * @throws HttpException */ - public function createPeriodicalBuilds(Logger $logger) + public function createPeriodicalBuilds(Logger $logger): void { $periodicalConfig = null; if (\file_exists(APP_DIR . 'periodical.yml')) { @@ -255,7 +255,7 @@ public function createPeriodicalBuilds(Logger $logger) * * @throws Exception */ - public function createDuplicateBuild(Build $originalBuild, $source) + public function createDuplicateBuild(Build $originalBuild, int $source): Build { $build = new Build($this->storeRegistry); $build->setParentId($originalBuild->getId()); @@ -294,7 +294,7 @@ public function createDuplicateBuild(Build $originalBuild, $source) * * @throws HttpException */ - public function deleteOldByProject($projectId) + public function deleteOldByProject(int $projectId): void { $keepBuilds = (int)$this->configuration->get('php-censor.build.keep_builds', 100); $builds = $this->buildStore->getOldByProject((int)$projectId, $keepBuilds); @@ -309,7 +309,7 @@ public function deleteOldByProject($projectId) /** * @param int $projectId */ - public function deleteAllByProject($projectId) + public function deleteAllByProject(int $projectId): void { $this->buildStore->deleteAllByProject((int)$projectId); @@ -341,7 +341,7 @@ public function deleteAllByProject($projectId) * * @return bool */ - public function deleteBuild(Build $build) + public function deleteBuild(Build $build): bool { $build->removeBuildDirectory(true); @@ -350,10 +350,11 @@ public function deleteBuild(Build $build) /** * Takes a build and puts it into the queue to be run (if using a queue) + * * @param Build $build * @param int $buildPriority priority in queue relative to default */ - public function addBuildToQueue(Build $build, $buildPriority = Project::DEFAULT_BUILD_PRIORITY) + public function addBuildToQueue(Build $build, int $buildPriority = Project::DEFAULT_BUILD_PRIORITY): void { $buildId = $build->getId(); @@ -373,7 +374,7 @@ public function addBuildToQueue(Build $build, $buildPriority = Project::DEFAULT_ * @param array $jobData * @param int $queuePriority */ - public function addJobToQueue($jobType, array $jobData, $queuePriority = PheanstalkInterface::DEFAULT_PRIORITY) + public function addJobToQueue(string $jobType, array $jobData, int $queuePriority = PheanstalkInterface::DEFAULT_PRIORITY): void { $settings = $this->configuration->get('php-censor.queue', []); if (!empty($settings['host']) && !empty($settings['name'])) { diff --git a/src/Service/BuildStatusService.php b/src/Service/BuildStatusService.php index 555a56aa2..0d7a70454 100644 --- a/src/Service/BuildStatusService.php +++ b/src/Service/BuildStatusService.php @@ -7,6 +7,7 @@ use Exception; use PHPCensor\Model\Build; use PHPCensor\Model\Project; +use function GuzzleHttp\Psr7\str; /** * @package PHP Censor @@ -36,13 +37,13 @@ class BuildStatusService * @param string $branch * @param Project $project * @param Build $build - * @param bool $isParent + * @param bool $isParent */ public function __construct( - $branch, + string $branch, Project $project, - Build $build = null, - $isParent = false + ?Build $build = null, + bool $isParent = false ) { $this->project = $project; $this->branch = $branch; @@ -58,7 +59,7 @@ public function __construct( /** * @param string $url */ - public function setUrl($url) + public function setUrl(string $url): void { $this->url = $url; } @@ -66,7 +67,7 @@ public function setUrl($url) /** * @return Build */ - public function getBuild() + public function getBuild(): Build { return $this->build; } @@ -76,7 +77,7 @@ public function getBuild() * * @throws Exception */ - protected function loadParentBuild($isParent = true) + protected function loadParentBuild(bool $isParent = true): void { if ($isParent === false && !$this->isFinished()) { $lastFinishedBuild = $this->project->getLatestBuild($this->branch, $this->finishedStatusIds); @@ -95,7 +96,7 @@ protected function loadParentBuild($isParent = true) /** * @return string */ - public function getActivity() + public function getActivity(): string { if (\in_array($this->build->getStatus(), $this->finishedStatusIds)) { return 'Sleeping'; @@ -110,7 +111,7 @@ public function getActivity() /** * @return string */ - public function getName() + public function getName(): string { return $this->project->getTitle() . ' / ' . $this->branch; } @@ -118,47 +119,51 @@ public function getName() /** * @return bool */ - public function isFinished() + public function isFinished(): bool { if (\in_array($this->build->getStatus(), $this->finishedStatusIds)) { return true; } + return false; } /** * @return null|Build */ - public function getFinishedBuildInfo() + public function getFinishedBuildInfo(): ?Build { if ($this->isFinished()) { return $this->build; } elseif ($this->prevService) { return $this->prevService->getBuild(); } + return null; } /** - * @return int|string + * @return string */ - public function getLastBuildLabel() + public function getLastBuildLabel(): string { if ($buildInfo = $this->getFinishedBuildInfo()) { - return $buildInfo->getId(); + return (string)$buildInfo->getId(); } + return ''; } /** * @return string */ - public function getLastBuildTime() + public function getLastBuildTime(): string { $dateFormat = 'Y-m-d\\TH:i:sO'; if ($buildInfo = $this->getFinishedBuildInfo()) { return ($buildInfo->getFinishDate()) ? $buildInfo->getFinishDate()->format($dateFormat) : ''; } + return ''; } @@ -167,7 +172,7 @@ public function getLastBuildTime() * * @return string */ - public function getBuildStatus(Build $build) + public function getBuildStatus(Build $build): string { switch ($build->getStatus()) { case Build::STATUS_SUCCESS: @@ -175,24 +180,26 @@ public function getBuildStatus(Build $build) case Build::STATUS_FAILED: return 'Failure'; } + return 'Unknown'; } /** * @return string */ - public function getLastBuildStatus() + public function getLastBuildStatus(): string { if ($build = $this->getFinishedBuildInfo()) { return $this->getBuildStatus($build); } + return ''; } /** * @return string */ - public function getBuildUrl() + public function getBuildUrl(): string { return $this->url . 'build/view/' . $this->build->getId(); } @@ -200,11 +207,12 @@ public function getBuildUrl() /** * @return array */ - public function toArray() + public function toArray(): array { if (!$this->build) { return []; } + return [ 'name' => $this->getName(), 'activity' => $this->getActivity(), diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index 8892476f3..71218fd60 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -37,15 +37,15 @@ public function __construct( /** * Create a new project model and use the project store to save it. * - * @param string $title - * @param string $type - * @param string $reference - * @param int $userId - * @param array $options + * @param string $title + * @param string $type + * @param string $reference + * @param int $userId + * @param array $options * * @return Project */ - public function createProject($title, $type, $reference, $userId, $options = []) + public function createProject(string $title, string $type, string $reference, int $userId, array $options = []): Project { // Create base project and use updateProject() to set its properties: $project = new Project($this->storeRegistry); @@ -66,7 +66,7 @@ public function createProject($title, $type, $reference, $userId, $options = []) * * @return Project */ - public function updateProject(Project $project, $title, $type, $reference, $options = []) + public function updateProject(Project $project, string $title, string $type, string $reference, array $options = []): Project { // Set basic properties: $project->setTitle($title); @@ -135,7 +135,7 @@ public function updateProject(Project $project, $title, $type, $reference, $opti * * @return bool */ - public function deleteProject(Project $project) + public function deleteProject(Project $project): bool { try { $fileSystem = new Filesystem(); @@ -156,7 +156,7 @@ public function deleteProject(Project $project) * * @return Project */ - protected function processAccessInformation(Project $project) + protected function processAccessInformation(Project $project): Project { $reference = $project->getReference(); diff --git a/src/Service/UserService.php b/src/Service/UserService.php index e5aa05144..a5db1075e 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -43,7 +43,7 @@ public function __construct( * * @return User */ - public function createUser($name, $email, $providerKey, $providerData, $password, $isAdmin = false) + public function createUser(string $name, string $email, string $providerKey, array $providerData, string $password, bool $isAdmin = false): ?User { $user = new User($this->storeRegistry); $user->setName($name); @@ -69,7 +69,7 @@ public function createUser($name, $email, $providerKey, $providerData, $password * * @return User */ - public function updateUser(User $user, $name, $emailAddress, $password = null, $isAdmin = null, $language = null, $perPage = null) + public function updateUser(User $user, string $name, string $emailAddress, ?string $password = null, ?bool $isAdmin = null, ?string $language = null, ?int $perPage = null): ?User { $user->setName($name); $user->setEmail($emailAddress); @@ -95,7 +95,7 @@ public function updateUser(User $user, $name, $emailAddress, $password = null, $ * * @return bool */ - public function deleteUser(User $user) + public function deleteUser(User $user): bool { return $this->store->delete($user); } From 427326f1df865f9252ef4f978d2495a8af4674aa Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:14:37 +0700 Subject: [PATCH 022/212] Types for models. --- src/Model/Base/Build.php | 13 ++----------- src/Model/Base/BuildError.php | 3 --- src/Model/Base/BuildMeta.php | 3 --- src/Model/Base/Environment.php | 3 --- src/Model/Base/Project.php | 8 +------- src/Model/Base/ProjectGroup.php | 3 --- src/Model/Base/User.php | 3 --- src/Model/Build.php | 15 +++------------ src/Model/Build/BitbucketBuild.php | 5 +---- src/Model/Build/BitbucketServerBuild.php | 5 +---- src/Model/Build/GithubBuild.php | 5 +---- src/Model/Build/SvnBuild.php | 2 +- 12 files changed, 10 insertions(+), 58 deletions(-) diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index fbe795a8a..69dc09802 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -36,9 +36,6 @@ class Build extends Model const SOURCE_MANUAL_REBUILD_WEB = 9; const SOURCE_MANUAL_REBUILD_CONSOLE = 10; - /** - * @var array - */ protected array $data = [ 'id' => null, 'parent_id' => null, @@ -62,20 +59,14 @@ class Build extends Model 'errors_new' => null, ]; - /** - * @var array - */ - protected $allowedStatuses = [ + protected array $allowedStatuses = [ self::STATUS_PENDING, self::STATUS_RUNNING, self::STATUS_SUCCESS, self::STATUS_FAILED, ]; - /** - * @var array - */ - protected $allowedSources = [ + protected array $allowedSources = [ self::SOURCE_UNKNOWN, self::SOURCE_MANUAL_WEB, self::SOURCE_MANUAL_CONSOLE, diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index 6d6e3eddd..f12d58ef5 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -22,9 +22,6 @@ class BuildError extends Model const SEVERITY_NORMAL = 2; const SEVERITY_LOW = 3; - /** - * @var array - */ protected array $data = [ 'id' => null, 'build_id' => null, diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 564bce41a..25c14f440 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -15,9 +15,6 @@ */ class BuildMeta extends Model { - /** - * @var array - */ protected array $data = [ 'id' => null, 'build_id' => null, diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index 9087304da..8d7f2cda1 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -14,9 +14,6 @@ */ class Environment extends Model { - /** - * @var array - */ protected array $data = [ 'id' => null, 'project_id' => null, diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index e38bef3de..f06d3e2f3 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -34,9 +34,6 @@ class Project extends Model const DEFAULT_BUILD_PRIORITY = 1000; const OFFSET_BETWEEN_BUILD_AND_QUEUE = 24; - /** - * @var array - */ protected array $data = [ 'id' => null, 'title' => null, @@ -56,10 +53,7 @@ class Project extends Model 'user_id' => null, ]; - /** - * @var array - */ - public static $allowedTypes = [ + public static array $allowedTypes = [ self::TYPE_LOCAL, self::TYPE_GIT, self::TYPE_GITHUB, diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index 03e554370..f1909e27d 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -16,9 +16,6 @@ */ class ProjectGroup extends Model { - /** - * @var array - */ protected array $data = [ 'id' => null, 'title' => null, diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index 32e22075a..7d77834af 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -15,9 +15,6 @@ */ class User extends Model { - /** - * @var array - */ protected array $data = [ 'id' => null, 'email' => null, diff --git a/src/Model/Build.php b/src/Model/Build.php index 64f676655..062e413d0 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -57,20 +57,11 @@ class Build extends BaseBuild self::SOURCE_WEBHOOK_PULL_REQUEST_MERGED, ]; - /** - * @var array - */ - protected $totalErrorsCount = []; + protected array $totalErrorsCount = []; - /** - * @var string - */ - protected $buildDirectory; + protected string $buildDirectory; - /** - * @var string - */ - protected $buildBranchDirectory; + protected string $buildBranchDirectory; /** * @return null|Project diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 54c29b8b8..b759622a5 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -21,10 +21,7 @@ */ class BitbucketBuild extends GitBuild { - /** - * @var array - */ - public static $pullrequestTriggersToSources = [ + public static array $pullrequestTriggersToSources = [ 'pullrequest:created' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, 'pullrequest:updated' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, 'pullrequest:approved' => Build::SOURCE_WEBHOOK_PULL_REQUEST_APPROVED, diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index bb0630a68..3851245fa 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -15,10 +15,7 @@ */ class BitbucketServerBuild extends GitBuild { - /** - * @var array - */ - public static $pullrequestTriggersToSources = [ + public static array $pullrequestTriggersToSources = [ 'pr:opened' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, 'pr:updated' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, 'pr:approved' => Build::SOURCE_WEBHOOK_PULL_REQUEST_APPROVED, diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index cc46aab20..63f36fc32 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -21,10 +21,7 @@ */ class GithubBuild extends GitBuild { - /** - * @var array - */ - public static $pullrequestTriggersToSources = [ + public static array $pullrequestTriggersToSources = [ 'opened' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, 'synchronize' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, 'reopened' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, diff --git a/src/Model/Build/SvnBuild.php b/src/Model/Build/SvnBuild.php index 2798d97ef..e34ab4948 100644 --- a/src/Model/Build/SvnBuild.php +++ b/src/Model/Build/SvnBuild.php @@ -17,7 +17,7 @@ */ class SvnBuild extends Build { - protected $svnCommand = 'svn export -q --non-interactive '; + protected string $svnCommand = 'svn export -q --non-interactive '; /** * Get the URL to be used to clone this remote repository. From 22601db4c39d8d0e548f7832c8aaa315b2550861 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 23 Jul 2021 23:14:58 +0700 Subject: [PATCH 023/212] Types for forms. --- src/Controller/ProjectController.php | 4 +- src/Form/ControlGroup.php | 2 + src/Form/Element.php | 113 +++++----------------- src/Form/Element/Button.php | 12 +-- src/Form/Element/Checkbox.php | 20 ++-- src/Form/Element/CheckboxGroup.php | 2 + src/Form/Element/Csrf.php | 12 +-- src/Form/Element/Email.php | 14 +-- src/Form/Element/Hidden.php | 2 + src/Form/Element/Password.php | 14 +-- src/Form/Element/Radio.php | 2 + src/Form/Element/Select.php | 21 ++-- src/Form/Element/Submit.php | 14 +-- src/Form/Element/Text.php | 7 +- src/Form/Element/TextArea.php | 26 ++--- src/Form/Element/Url.php | 6 +- src/Form/FieldSet.php | 42 +++----- src/Form/Input.php | 107 ++++++-------------- src/Form/Validator/ValidatorInterface.php | 4 +- src/Form/Validator/Yaml.php | 9 +- tests/src/Form/FormInputTest.php | 2 +- tests/src/FormTest.php | 2 +- 22 files changed, 144 insertions(+), 293 deletions(-) diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 8560a1426..0cb935150 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -603,14 +603,14 @@ protected function projectForm($values, $type = 'add') $field->setClass('form-control')->setContainerClass('form-group'); $field->setRows(6); $field->setValidator(new Form\Validator\Yaml()); - $field->setDataTransformator(new Form\DataTransformer\Yaml()); + $field->setDataTransformer(new Form\DataTransformer\Yaml()); $form->addField($field); $field = Form\Element\TextArea::create('environments', Lang::get('environments_label'), false); $field->setClass('form-control')->setContainerClass('form-group'); $field->setRows(6); $field->setValidator(new Form\Validator\Yaml()); - $field->setDataTransformator(new Form\DataTransformer\Yaml()); + $field->setDataTransformer(new Form\DataTransformer\Yaml()); $form->addField($field); $field = Form\Element\Select::create('group_id', Lang::get('project_group'), true); diff --git a/src/Form/ControlGroup.php b/src/Form/ControlGroup.php index fc7c89452..ca73ebd3d 100644 --- a/src/Form/ControlGroup.php +++ b/src/Form/ControlGroup.php @@ -1,5 +1,7 @@ setName($name); } } - /** - * @return string - */ - public function getName() + public function getName(): string { return $this->name; } - /** - * @param string $name - * - * @return $this - */ - public function setName($name) + public function setName(string $name): self { $this->name = \strtolower(\preg_replace('/([^a-zA-Z0-9_\-%])/', '', $name)); return $this; } - /** - * @return string - */ - public function getId() + public function getId(): string { return !$this->id ? ('element-' . $this->name) : $this->id; } - /** - * @param string $id - * - * @return $this - */ - public function setId($id) + public function setId(string $id): self { $this->id = $id; return $this; } - /** - * @return string - */ - public function getLabel() + public function getLabel(): string { return $this->label; } - /** - * @param string $label - * - * @return $this - */ - public function setLabel($label) + public function setLabel(string $label): self { $this->label = $label; return $this; } - /** - * @return string - */ - public function getClass() + public function getClass(): string { return $this->class; } - /** - * @param string $class - * - * @return $this - */ - public function setClass($class) + public function setClass(string $class): self { $this->class = $class; return $this; } - /** - * @return string - */ - public function getContainerClass() + public function getContainerClass(): string { return $this->containerClass; } - /** - * @param string $class - * - * @return $this - */ - public function setContainerClass($class) + public function setContainerClass(string $class): self { $this->containerClass = $class; return $this; } - /** - * @param Element $parent - * - * @return $this - */ - public function setParent(Element $parent) + public function setParent(Element $parent): self { $this->parent = $parent; return $this; } - /** - * @param string $viewFile - * - * @return string - */ - public function render($viewFile = null) + public function render(?string $viewFile = null): string { if (\is_null($viewFile)) { $class = \explode('\\', \get_called_class()); @@ -196,5 +127,5 @@ public function render($viewFile = null) /** * @param View $view */ - abstract protected function onPreRender(View &$view); + abstract protected function onPreRender(View &$view): void; } diff --git a/src/Form/Element/Button.php b/src/Form/Element/Button.php index 6390658bf..9789380fc 100644 --- a/src/Form/Element/Button.php +++ b/src/Form/Element/Button.php @@ -1,5 +1,7 @@ checkedValue = $value; + + return $this; } /** * @param mixed $value */ - public function setValue($value) + public function setValue($value): self { if (is_bool($value) && $value === true) { $this->value = $this->getCheckedValue(); $this->checked = true; - return; + + return $this; } if ($value == $this->getCheckedValue()) { $this->value = $this->getCheckedValue(); $this->checked = true; - return; + + return $this; } $this->value = $value; $this->checked = false; + + return $this; } /** * @param View $view */ - public function onPreRender(View &$view) + protected function onPreRender(View &$view): void { parent::onPreRender($view); diff --git a/src/Form/Element/CheckboxGroup.php b/src/Form/Element/CheckboxGroup.php index 38779f928..b825e13a4 100644 --- a/src/Form/Element/CheckboxGroup.php +++ b/src/Form/Element/CheckboxGroup.php @@ -1,5 +1,7 @@ getName()]) ? $_SESSION['csrf_tokens'][$this->getName()] @@ -29,10 +28,7 @@ public function validate() return true; } - /** - * @param View $view - */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { parent::onPreRender($view); diff --git a/src/Form/Element/Email.php b/src/Form/Element/Email.php index c404d30fc..662fa8bf4 100644 --- a/src/Form/Element/Email.php +++ b/src/Form/Element/Email.php @@ -1,5 +1,7 @@ options = $options; + + return $this; } - /** - * @param View $view - */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { parent::onPreRender($view); diff --git a/src/Form/Element/Submit.php b/src/Form/Element/Submit.php index c0373d30e..d086115b7 100644 --- a/src/Form/Element/Submit.php +++ b/src/Form/Element/Submit.php @@ -1,5 +1,7 @@ rows; } - /** - * @param int $rows - */ - public function setRows($rows) + public function setRows(int $rows): self { $this->rows = $rows; + + return $this; } - /** - * @param View $view - */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { parent::onPreRender($view); diff --git a/src/Form/Element/Url.php b/src/Form/Element/Url.php index 60645ae0c..094e3a85f 100644 --- a/src/Form/Element/Url.php +++ b/src/Form/Element/Url.php @@ -1,5 +1,7 @@ children as $field) { @@ -43,10 +42,7 @@ public function getValues() return $rtn; } - /** - * @param array $values - */ - public function setValues(array $values) + public function setValues(array $values): self { foreach ($this->children as $field) { if ($field instanceof FieldSet) { @@ -65,21 +61,19 @@ public function setValues(array $values) } } } + + return $this; } - /** - * @param Element $field - */ - public function addField(Element $field) + public function addField(Element $field): self { $this->children[$field->getName()] = $field; $field->setParent($this); + + return $this; } - /** - * @return bool - */ - public function validate() + public function validate(): bool { $rtn = true; @@ -95,7 +89,7 @@ public function validate() /** * @param View $view */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { $rendered = []; foreach ($this->children as $child) { @@ -105,20 +99,12 @@ protected function onPreRender(View &$view) $view->children = $rendered; } - /** - * @return Element[] - */ - public function getChildren() + public function getChildren(): array { return $this->children; } - /** - * @param string $fieldName - * - * @return Element - */ - public function getChild($fieldName) + public function getChild(string $fieldName): Element { return $this->children[$fieldName]; } diff --git a/src/Form/Input.php b/src/Form/Input.php index 7fc0e1a4b..7d622d79e 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -1,5 +1,7 @@ setName($name); $el->setLabel($label); $el->setRequired($required); @@ -71,8 +54,8 @@ public static function create($name, $label, $required = false) */ public function getValue() { - if (!empty($this->getDataTransformator())) { - return $this->getDataTransformator()->reverseTransform($this->value); + if (!empty($this->getDataTransformer())) { + return $this->getDataTransformer()->reverseTransform($this->value); } return $this->value; @@ -83,10 +66,10 @@ public function getValue() * * @return $this */ - public function setValue($value) + public function setValue($value): self { - if (!empty($this->getDataTransformator())) { - $this->value = $this->getDataTransformator()->transform($value); + if (!empty($this->getDataTransformer())) { + $this->value = $this->getDataTransformer()->transform($value); } else { $this->value = $value; } @@ -94,22 +77,14 @@ public function setValue($value) return $this; } - /** - * @return bool - */ - public function getRequired() + public function getRequired(): bool { return $this->required; } - /** - * @param bool $required - * - * @return $this - */ - public function setRequired($required) + public function setRequired(bool $required): self { - $this->required = (bool)$required; + $this->required = $required; return $this; } @@ -122,12 +97,7 @@ public function getValidator() return $this->validator; } - /** - * @param callable $validator - * - * @return $this - */ - public function setValidator($validator) + public function setValidator($validator): self { if (\is_callable($validator) || $validator instanceof Closure) { $this->validator = $validator; @@ -136,37 +106,26 @@ public function setValidator($validator) return $this; } - /** - * @return string - */ - public function getPattern() + public function getPattern(): string { return $this->pattern; } - /** - * @param string $pattern - * - * @return $this - */ - public function setPattern($pattern) + public function setPattern(string $pattern): self { $this->pattern = $pattern; return $this; } - /** - * @return bool - */ - public function validate() + public function validate(): bool { if ($this->getRequired() && empty($this->getValue())) { $this->error = $this->getLabel() . ' is required.'; return false; } - if ($this->getPattern() && !\preg_match('/' . $this->getPattern() . '/', $this->getValue())) { + if ($this->getPattern() && !\preg_match('/' . $this->getPattern() . '/', (string)$this->getValue())) { $this->error = 'Invalid value entered.'; return false; @@ -191,12 +150,7 @@ public function validate() return true; } - /** - * @param string $message - * - * @return $this - */ - public function setError($message) + public function setError(string $message): self { $this->customError = true; $this->error = $message; @@ -207,7 +161,7 @@ public function setError($message) /** * @param View $view */ - protected function onPreRender(View &$view) + protected function onPreRender(View &$view): void { $view->value = $this->getValue(); $view->error = $this->error; @@ -215,16 +169,15 @@ protected function onPreRender(View &$view) $view->required = $this->required; } - /** - * @return DataTransformerInterface - */ - public function getDataTransformator() + public function getDataTransformer(): ?DataTransformerInterface { - return $this->dataTransformator; + return $this->dataTransformer; } - public function setDataTransformator(DataTransformerInterface $dataTransformator) + public function setDataTransformer(DataTransformerInterface $dataTransformer): self { - $this->dataTransformator = $dataTransformator; + $this->dataTransformer = $dataTransformer; + + return $this; } } diff --git a/src/Form/Validator/ValidatorInterface.php b/src/Form/Validator/ValidatorInterface.php index b441929e7..eeda83ba2 100644 --- a/src/Form/Validator/ValidatorInterface.php +++ b/src/Form/Validator/ValidatorInterface.php @@ -1,5 +1,7 @@ getParser()->parse($value); @@ -28,7 +29,7 @@ public function __invoke($value) return true; } - public function getParser() + public function getParser(): Parser { if (!$this->parser) { $this->parser = new Parser(); diff --git a/tests/src/Form/FormInputTest.php b/tests/src/Form/FormInputTest.php index 1ec77da34..ab3c8d935 100644 --- a/tests/src/Form/FormInputTest.php +++ b/tests/src/Form/FormInputTest.php @@ -46,7 +46,7 @@ public function testGetValue() public function testGetValueWithDatatransformer() { - $this->inputElement->setDataTransformator(new Yaml()); + $this->inputElement->setDataTransformer(new Yaml()); $this->inputElement->setValue("key\t=>\tvalue"); $this->assertEquals('key => value', $this->inputElement->getValue()); } diff --git a/tests/src/FormTest.php b/tests/src/FormTest.php index bfa136993..141cdca3c 100644 --- a/tests/src/FormTest.php +++ b/tests/src/FormTest.php @@ -92,7 +92,7 @@ public function testInputValidation() self::assertTrue($f->validate()); $f->setValue('fail'); - $f->setPattern(null); + $f->setPattern(''); self::assertFalse($f->validate()); } From 8d9fa4208067e41f21baf465960c6596fdc989f2 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 24 Jul 2021 23:43:33 +0700 Subject: [PATCH 024/212] Fixes for type hints. --- src/Controller.php | 4 ++-- src/Controller/BuildController.php | 8 ++++---- src/Controller/SessionController.php | 8 ++++---- src/Form/Input.php | 2 +- src/Http/Router.php | 9 +++++++-- src/Logging/BuildDBLogHandler.php | 2 +- src/Service/BuildService.php | 2 +- src/Store/BuildStore.php | 4 ++-- src/View/Form/Text.phtml | 4 ++-- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/Controller.php b/src/Controller.php index c62d8119f..78a46364d 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -56,9 +56,9 @@ public function hasAction(string $name): bool * @param string $action * @param array $actionParams * - * @return Response + * @return Response|string */ - public function handleAction(string $action, array $actionParams): Response + public function handleAction(string $action, array $actionParams) { return \call_user_func_array([$this, $action], $actionParams); } diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 88e78eb48..315aa386c 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -211,14 +211,14 @@ protected function getUiPlugins(): array protected function getBuildData( Build $build, string $plugin, - int $severity, + ?int $severity, string $isNew, int $start = 0, int $perPage = 10 ): array { $data = []; $data['status'] = (int)$build->getStatus(); - $data['log'] = $this->cleanLog($build->getLog()); + $data['log'] = $this->cleanLog((string)$build->getLog()); $data['create_date'] = !\is_null($build->getCreateDate()) ? $build->getCreateDate()->format('Y-m-d H:i:s') @@ -263,7 +263,7 @@ protected function getBuildData( protected function getPaginatorHtml( int $buildId, string $plugin, - int $severity, + ?int $severity, string $isNew, int $total, int $perPage, @@ -473,7 +473,7 @@ public function ajaxMeta(int $buildId): Response ); $key = $this->getParam('key'); - $numBuilds = $this->getParam('num_builds', 1); + $numBuilds = (int)$this->getParam('num_builds', 1); $data = null; if ($key && $build) { diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index efbf21bce..78af17c01 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -149,7 +149,7 @@ public function login() $_SESSION['php-censor-user-id'] = $user->getId(); if ($rememberMe) { - $rememberKey = \md5(\microtime(true)); + $rememberKey = \md5((string)\microtime(true)); $user->setRememberKey($rememberKey); $this->userStore->save($user); @@ -158,9 +158,9 @@ public function login() 'remember_key', $rememberKey, (\time() + 60 * 60 * 24 * 30), - null, - null, - null, + '', + '', + false, true ); } diff --git a/src/Form/Input.php b/src/Form/Input.php index 7d622d79e..877e0813e 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -55,7 +55,7 @@ public static function create(string $name, string $label, bool $required = fals public function getValue() { if (!empty($this->getDataTransformer())) { - return $this->getDataTransformer()->reverseTransform($this->value); + return $this->getDataTransformer()->reverseTransform((string)$this->value); } return $this->value; diff --git a/src/Http/Router.php b/src/Http/Router.php index 50fa39c5e..c585b4794 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -108,14 +108,19 @@ public function dispatch() } } - $thisArgs = $pathParts; + foreach ($pathParts as &$pathPart) { + if (\is_numeric($pathPart)) { + $pathPart = (int)$pathPart; + } + } + unset($pathPart); if ($routeMatches) { $route = [ 'namespace' => $thisNamespace, 'controller' => $thisController, 'action' => $thisAction, - 'args' => $thisArgs, + 'args' => $pathParts, 'callback' => $route['callback'] ]; diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index 403af9cdd..5dd67e129 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -50,7 +50,7 @@ public function __construct( $this->buildStore = $buildStore; // We want to add to any existing saved log information. - $this->logValue = $build->getLog(); + $this->logValue = (string)$build->getLog(); } public function __destruct() diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index fb30359b4..9967ca355 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -382,7 +382,7 @@ public function addJobToQueue(string $jobType, array $jobData, int $queuePriorit try { $pheanstalk = Pheanstalk::create( $settings['host'], - $this->configuration->get('php-censor.queue.port', PheanstalkInterface::DEFAULT_PORT) + (int)$this->configuration->get('php-censor.queue.port', PheanstalkInterface::DEFAULT_PORT) ); $pheanstalk->useTube($settings['name']); diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 34eb7418e..b7d77dcbb 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -251,9 +251,9 @@ public function getLastBuildByStatus(?int $projectId = null, int $status = Build if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { return new Build($this->storeRegistry, $data); } - } else { - return null; } + + return null; } /** diff --git a/src/View/Form/Text.phtml b/src/View/Form/Text.phtml index 3ec2568f8..e019ab8c8 100644 --- a/src/View/Form/Text.phtml +++ b/src/View/Form/Text.phtml @@ -6,8 +6,8 @@
          - + + > From 90dee815f06f5051efe03e7e884ad164d9e2f4b4 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 24 Jul 2021 23:43:58 +0700 Subject: [PATCH 025/212] Fixed colors for chart.js charts. --- public/assets/js/build-plugins/loc.js | 32 +++++++++---------- .../js/build-plugins/phpunit-coverage.js | 24 +++++++------- public/assets/js/build-plugins/warnings.js | 8 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index c5b2c446b..c16cccc25 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -50,28 +50,28 @@ var locPlugin = ActiveBuild.UiPlugin.extend({ labels: [], datasets: [ { - label: Lang.get('lines'), - borderColor: "#555299", - color: "#555299", - data: [] + label: Lang.get('lines'), + borderColor: "#555299", + backgroundColor: "#555299", + data: [] }, { - label: Lang.get('logical_lines'), - borderColor: "#00A65A", - color: "#00A65A", - data: [] + label: Lang.get('logical_lines'), + borderColor: "#00A65A", + backgroundColor: "#00A65A", + data: [] }, { - label: Lang.get('comment_lines'), - borderColor: "#8AA4AF", - color: "#8AA4AF", - data: [] + label: Lang.get('comment_lines'), + borderColor: "#8AA4AF", + backgroundColor: "#8AA4AF", + data: [] }, { - label: Lang.get('noncomment_lines'), - borderColor: "#00A7D0", - color: "#00A7D0", - data: [] + label: Lang.get('noncomment_lines'), + borderColor: "#00A7D0", + backgroundColor: "#00A7D0", + data: [] } ] }; diff --git a/public/assets/js/build-plugins/phpunit-coverage.js b/public/assets/js/build-plugins/phpunit-coverage.js index f43308849..f3697f8f2 100644 --- a/public/assets/js/build-plugins/phpunit-coverage.js +++ b/public/assets/js/build-plugins/phpunit-coverage.js @@ -50,22 +50,22 @@ var coveragePlugin = ActiveBuild.UiPlugin.extend({ labels: [], datasets: [ { - label: Lang.get('classes'), - borderColor: "#555299", - color: "#555299", - data: [] + label: Lang.get('classes'), + borderColor: "#555299", + backgroundColor: "#555299", + data: [] }, { - label: Lang.get('methods'), - borderColor: "#00A65A", - color: "#00A65A", - data: [] + label: Lang.get('methods'), + borderColor: "#00A65A", + backgroundColor: "#00A65A", + data: [] }, { - label: Lang.get('lines'), - borderColor: "#8AA4AF", - color: "#8AA4AF", - data: [] + label: Lang.get('lines'), + borderColor: "#8AA4AF", + backgroundColor: "#8AA4AF", + data: [] } ] }; diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 83d0daa52..60ceb2501 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -122,10 +122,10 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ var color = colors.shift(); self.chartData.datasets.push({ - label: self.keys[key], - borderColor: color, - color: color, - data: [] + label: self.keys[key], + borderColor: color, + backgroundColor: color, + data: [] }); for (var build in self.data) { From 1eeddfd86d608971f3879df11a634791eaf7c456 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 25 Jul 2021 14:16:55 +0700 Subject: [PATCH 026/212] Fixed types. Issue #413. --- src/Application.php | 2 +- src/Builder.php | 2 +- src/Controller/BuildController.php | 4 ++-- src/Model.php | 6 ++++++ src/Model/Base/Build.php | 2 +- src/Store.php | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Application.php b/src/Application.php index a70f93fb2..d8342cfcf 100644 --- a/src/Application.php +++ b/src/Application.php @@ -65,7 +65,7 @@ public function init(): void // Inlined as a closure to fix "using $this when not in object context" on 5.3 $validateSession = function () { if (!empty($_SESSION['php-censor-user-id'])) { - $user = $this->storeRegistry->get('User')->getByPrimaryKey($_SESSION['php-censor-user-id']); + $user = $this->storeRegistry->get('User')->getByPrimaryKey((int)$_SESSION['php-censor-user-id']); if ($user) { return true; diff --git a/src/Builder.php b/src/Builder.php index 0149e6539..e0bb9ce7e 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -280,7 +280,7 @@ protected function setErrorTrend(): void ); if (isset($trend[1])) { - $previousBuild = $this->store->getById($trend[1]['build_id']); + $previousBuild = $this->store->getById((int)$trend[1]['build_id']); if ($previousBuild && !\in_array( $previousBuild->getStatus(), diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 315aa386c..89dcaa033 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -153,7 +153,7 @@ public function view(int $buildId): void $delete = Lang::get('delete_build'); $deleteLink = APP_URL . 'build/delete/' . $build->getId(); - $project = $this->storeRegistry->get('Project')->getByPrimaryKey($build->getProjectId()); + $project = $this->storeRegistry->get('Project')->getByPrimaryKey((int)$build->getProjectId()); $actions = ''; if (!$project->getArchived()) { @@ -316,7 +316,7 @@ public function rebuild(int $buildId): Response (int)$buildId ); - $project = $this->storeRegistry->get('Project')->getByPrimaryKey($copy->getProjectId()); + $project = $this->storeRegistry->get('Project')->getByPrimaryKey((int)$copy->getProjectId()); if (!$copy || $project->getArchived()) { throw new NotFoundException(Lang::get('build_x_not_found', $buildId)); diff --git a/src/Model.php b/src/Model.php index cd2f67789..a6b0afbd7 100644 --- a/src/Model.php +++ b/src/Model.php @@ -26,6 +26,12 @@ public function __construct( if (\is_array($initialData)) { foreach ($initialData as $index => $item) { if (\array_key_exists($index, $this->data)) { + if ('id' === \substr($index, - 2) && null !== $item) { + $this->data[$index] = (int)$item; + + continue; + } + $this->data[$index] = $item; } } diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 69dc09802..830243898 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -627,7 +627,7 @@ public function getErrorsTotalPrevious() $trend = $store->getBuildErrorsTrend($this->getId(), $this->getProjectId(), $this->getBranch()); if (isset($trend[1])) { - $previousBuild = $store->getById($trend[1]['build_id']); + $previousBuild = $store->getById((int)$trend[1]['build_id']); if ($previousBuild && !\in_array( $previousBuild->getStatus(), diff --git a/src/Store.php b/src/Store.php index f3c10e27d..d939f7e82 100644 --- a/src/Store.php +++ b/src/Store.php @@ -178,7 +178,7 @@ public function saveByUpdate(Model $obj, bool $saveAllColumns = false): ?Model $q->bindValue(':primaryKey', $data[$this->primaryKey]); $q->execute(); - $rtn = $this->getByPrimaryKey($data[$this->primaryKey], 'write'); + $rtn = $this->getByPrimaryKey((int)$data[$this->primaryKey], 'write'); } else { $rtn = $obj; } From 790cdc031ce27b22bf78811bc142568cda91735a Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 1 Aug 2021 23:21:25 +0700 Subject: [PATCH 027/212] Docs improvement (Doc about upgrade from v1 to v2). --- README.md | 16 ++++++++-------- docs/UPGRADE_2.0.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 889c8fb93..c835f52c9 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ PHP Censor versions: -| Version | Latest | Branch | Status | Minimal PHP Version | -| :------------------: | :------: | :-----------: | :---------------------------------: | :-----------------: | -| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.4` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.4` | `release-2.0` | Current stable version | `>=7.4` | -| `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | +| Version | Latest | Branch | Status | Minimal PHP Version | +| :------------------: | :------: | :-----------: | :-------------------------------------------------------------------: | :-----------------: | +| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.3` (Jerry Smith) | `1.3.4` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.4` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) diff --git a/docs/UPGRADE_2.0.md b/docs/UPGRADE_2.0.md index b39529db5..71145c55d 100644 --- a/docs/UPGRADE_2.0.md +++ b/docs/UPGRADE_2.0.md @@ -2,7 +2,7 @@ Upgrade from v1 to v2 ===================== 1. [Upgrade your PHP Censor installation to latest v1 release](https://github.com/php-censor/php-censor/blob/release-1.3/README.md#updating) -(`1.3.0`). +(`1.3.*`). 2. If you use [cronjob worker](https://github.com/php-censor/php-censor/blob/release-1.3/docs/en/workers/cron.md), you should migrate to [daemon worker](en/workers/worker.md). 3. Fix all deprecations from v1 on your installation: From 57185b733023e8df5518400a5cbec6c484ec5b4f Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 22 Aug 2021 15:02:56 +0700 Subject: [PATCH 028/212] Updated versions in readme. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index afe2ba358..0b1905909 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ PHP Censor versions: | `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.4` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.4` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `1.3` (Jerry Smith) | `1.3.5` | `release-1.3` | Old stable version (**ONLY FIXES**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.5` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From ee0cb18d366a59e4a16af92b49f0ea982f9ce961 Mon Sep 17 00:00:00 2001 From: Olha Babchenko Date: Sun, 10 Oct 2021 23:14:40 +0300 Subject: [PATCH 029/212] Improving ukrainian localization by adding translation of missing strings --- src/Languages/lang.uk.php | 109 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/src/Languages/lang.uk.php b/src/Languages/lang.uk.php index 35c9d4a38..1665929f2 100644 --- a/src/Languages/lang.uk.php +++ b/src/Languages/lang.uk.php @@ -3,6 +3,8 @@ return [ 'language_name' => 'Українська', 'language' => 'Мова', + 'per_page' => 'Кількість елементів на сторінці', + 'default' => 'За замовчуванням', // Log in: 'log_in_to_app' => 'Увійти до PHP Censor', @@ -34,9 +36,11 @@ 'email_address' => 'Email адреса', 'login' => 'Логин / Email адреса', 'password' => 'Пароль', + 'remember_me' => 'Запам\'ятати мене', 'log_in' => 'Увійти', + // Top Nav 'toggle_navigation' => 'Сховати/відобразити панель навігації', 'n_builds_pending' => '%d збірок очікує', @@ -46,19 +50,24 @@ 'branch_x' => 'Гілка: %s', 'created_x' => 'Створено: %s', 'started_x' => 'Розпочато: %s', + 'environment_x' => 'Cередовище: %s', // Sidebar 'hello_name' => 'Привіт, %s', 'dashboard' => 'Панель управління', 'admin_options' => 'Меню адміністратора', 'add_project' => 'Додати проект', + 'project_groups' => 'Групи проектів', 'settings' => 'Налаштування', 'manage_users' => 'Управління користувачами', 'plugins' => 'Плагіни', 'view' => 'Переглянути', 'build_now' => 'Зібрати', + 'build_now_debug' => 'Зібрати в режимі налагодження', 'edit_project' => 'Редагувати проект', 'delete_project' => 'Видалити проект', + 'delete_old_builds' => 'Видалити старі збірки', + 'delete_all_builds' => 'Видалити всі збірки', // Project Summary: 'no_builds_yet' => 'Немає збірок!', @@ -69,6 +78,8 @@ 'last_failed_build' => 'Останньою проваленою збіркою була %s.', 'never_failed_build' => 'У цього проекта ніколи не було провалених збірок.', 'view_project' => 'Переглянути проект', + 'projects_with_build_errors' => 'Проекті з помилками збірки', + 'no_build_errors' => 'Немає помилок збірки', // Timeline: 'latest_builds' => 'Останні збірки', @@ -76,7 +87,11 @@ 'running' => 'Виконується', 'success' => 'Успіх', 'failed' => 'Провалена', + 'failed_allowed' => 'Припустимий провал', 'manual_build' => 'Ручна збірка', + 'error' => 'Помилка', + 'skipped' => 'Пропустили', + 'trace' => 'Стек виклику', // Add/Edit Project: 'new_project' => 'Новий проект', @@ -91,6 +106,7 @@ 'git' => 'Git', 'local' => 'Локальний шлях', 'hg' => 'Mercurial', + 'svn' => 'Subversion', 'where_hosted' => 'Де зберігається ваш проект?', 'choose_github' => 'Оберіть GitHub репозиторій:', @@ -102,6 +118,7 @@ 'build_config' => 'Конфігурація збірки цього проекта для PHP Censor (якщо ви не додали файл .php-censor.yml до репозиторію вашого проекту)', 'default_branch' => 'Назва гілки за замовчуванням', + 'default_branch_only' => 'Тільки гілку за замовчуванням', 'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?', 'archived' => 'Архівний', 'archived_menu' => 'Архів', @@ -289,4 +306,96 @@ 'passing_build' => 'Успішно збірка', 'failing_build' => 'Невдала збірка', 'log_output' => 'Вивід лога:', + + 'overwrite_build_config' =>'Перезаписати конфігурацію файлу в сховищі конфігурацією в базі даних? Якщо прапорець не встановлено, конфігурація в базі даних буде об’єднана з файлом config.', + 'environments_label' =>'Середовище (yaml)', + 'all' =>'Всі', + 'environment' =>'Середовище', + 'build_source' =>'Джерело збірки', + 'source_unknown' =>'Джерело невідомо', + 'source_manual_web' =>'Вручну (з Інтернету)', + 'source_manual_console' =>'Вручну (з CLI)', + 'source_periodical' =>'Періодичний', + 'source_webhook_push' =>'Webhook (Push)', + 'source_webhook_pull_request_created' =>'Webhook (створено pull request)', + 'source_webhook_pull_request_updated' =>'Webhook (оновлено pull request) ', + 'source_webhook_pull_request_approved' =>'Webhook (схвалено pull request) ', + 'source_webhook_pull_request_merged' =>'Webhook (об\'єднано pull request) ', + 'group_projects' =>'Групи проектів', + 'project_group' =>'Група проекту', + 'group_count' =>'Кількість проектів', + 'group_edit' =>'Редагувати групу', + 'group_delete' =>'Видалити групу', + 'group_add' =>'Додати групу', + 'group_add_edit' =>'Додати / редагувати групу', + 'group_title' =>'Назва групи', + 'group_save' =>'Зберігти групу', + 'errors' =>'Помилки', + 'information' =>'Інформаця', + 'is_new' =>'Нова?', + 'new' =>'Нова', + 'rebuild_now_debug' =>'Перезібраті в режимі налагодження', + 'all_errors' =>'Всі помилки', + 'only_new' =>'Тільки нові', + 'only_old' =>'Тількі старі', + 'new_errors' =>'Нові помилки', + 'total_errors' =>'Всього помилок', + 'classes' =>'Класів', + 'methods' =>'Методів', + 'coverage' =>'Покриття коду тестами PHPUnit', + 'phan_warnings' =>'Попередження phan', + 'php_cs_fixer_warnings' =>'Попередження PHP CS Fixer', + 'php_cpd_warnings' =>'Попередження PHP Copy/Paste Detector', + 'php_tal_lint_warnings' =>'Попередження PHP Tal Lint', + 'php_tal_lint_errors' =>'Помилки PHP Tal Lint', + 'behat_warnings' =>'Попередження Behat', + 'sensiolabs_insight_warnings' =>'Попередження Sensiolabs Insight', + 'technical_debt_warnings' =>'Попередження Technical Debt', + 'merged_branches' =>'Гілки, що об’єднуються', + 'codeception_feature' =>'Властивість', + 'codeception_suite' =>'Набір', + 'codeception_time' =>'Час', + 'codeception_synopsis' =>'Тестов виконано: %1$d (за %2$f сек.). Невдач : %3$d.', + 'suite' =>'Набір', + 'test' =>'Тест', + 'build-summary' =>'Зведення', + 'stage' =>'Етап', + 'duration' =>'Тривалість', + 'seconds' =>'сек.', + 'plugin' =>'Плагін', + 'stage_setup' =>'Встановлення', + 'stage_test' =>'Тестування', + 'stage_deploy' =>'Розгортання', + 'stage_complete' =>'Завершення', + 'stage_success' =>'Успішне завершення', + 'stage_failure' =>'Невдача', + 'stage_broken' =>'Поломка', + 'stage_fixed' =>'Виправлення', + 'severity' =>'Рівень', + 'all_plugins' =>'Всі плагіни', + 'all_severities' =>'Всі рівні', + 'filters' =>'Фільтри', + 'errors_selected' =>'Помилок вибрано', + 'build_details' =>'Інформація про збірку', + 'commit_details' =>'Інформація про комміт', + 'committer' =>'Автор комміту', + 'commit_message' =>'Повідомлення в комміті', + 'timing' =>'Таймінг', + 'created' =>'Створено', + 'started' =>'Почалося', + 'finished' =>'Закінчено', + 'add_to_queue_failed' =>'Збірка успішно створена, але виникла проблема при додаванні збірки в чергу. Зазвичай таке відбувається, коли PHP Censor намагається працювати з неіснуючим або зупиненим сервером черг Beanstalkd.', + 'critical' =>'Критичний', + 'high' =>'Високий', + 'normal' =>'Нормальний', + 'low' =>'Низький', + 'confirm_message' =>'Елемент буде видалений назавжди. Ви впевнені?', + 'confirm_title' =>'Підтвердження видалення', + 'confirm_ok' =>'Видалити', + 'confirm_cancel' =>'Відміна', + 'confirm_success' =>'Елемент успішно видалений.', + 'confirm_failed' =>'Видалення провалилося! Відповідь сервера: ', + 'public_status_title' =>'Публічний статус', + 'public_status_image' =>'Іконка статусу', + 'public_status_page' =>'Сторінка публічного статусу', ]; From f9be75c9e4722f66e0b0e65ca0ca9b8279490d30 Mon Sep 17 00:00:00 2001 From: Olha Babchenko Date: Sun, 10 Oct 2021 23:26:40 +0300 Subject: [PATCH 030/212] Quick fix of "Line exceeds 120 characters" error --- src/Languages/lang.uk.php | 201 +++++++++++++++++++------------------- 1 file changed, 102 insertions(+), 99 deletions(-) diff --git a/src/Languages/lang.uk.php b/src/Languages/lang.uk.php index 1665929f2..ab5167b54 100644 --- a/src/Languages/lang.uk.php +++ b/src/Languages/lang.uk.php @@ -3,8 +3,8 @@ return [ 'language_name' => 'Українська', 'language' => 'Мова', - 'per_page' => 'Кількість елементів на сторінці', - 'default' => 'За замовчуванням', + 'per_page' => 'Кількість елементів на сторінці', + 'default' => 'За замовчуванням', // Log in: 'log_in_to_app' => 'Увійти до PHP Censor', @@ -36,11 +36,10 @@ 'email_address' => 'Email адреса', 'login' => 'Логин / Email адреса', 'password' => 'Пароль', - 'remember_me' => 'Запам\'ятати мене', + 'remember_me' => 'Запам\'ятати мене', 'log_in' => 'Увійти', - // Top Nav 'toggle_navigation' => 'Сховати/відобразити панель навігації', 'n_builds_pending' => '%d збірок очікує', @@ -91,7 +90,7 @@ 'manual_build' => 'Ручна збірка', 'error' => 'Помилка', 'skipped' => 'Пропустили', - 'trace' => 'Стек виклику', + 'trace' => 'Стек виклику', // Add/Edit Project: 'new_project' => 'Новий проект', @@ -105,8 +104,8 @@ 'gitlab' => 'GitLab', 'git' => 'Git', 'local' => 'Локальний шлях', - 'hg' => 'Mercurial', - 'svn' => 'Subversion', + 'hg' => 'Mercurial', + 'svn' => 'Subversion', 'where_hosted' => 'Де зберігається ваш проект?', 'choose_github' => 'Оберіть GitHub репозиторій:', @@ -307,95 +306,99 @@ 'failing_build' => 'Невдала збірка', 'log_output' => 'Вивід лога:', - 'overwrite_build_config' =>'Перезаписати конфігурацію файлу в сховищі конфігурацією в базі даних? Якщо прапорець не встановлено, конфігурація в базі даних буде об’єднана з файлом config.', - 'environments_label' =>'Середовище (yaml)', - 'all' =>'Всі', - 'environment' =>'Середовище', - 'build_source' =>'Джерело збірки', - 'source_unknown' =>'Джерело невідомо', - 'source_manual_web' =>'Вручну (з Інтернету)', - 'source_manual_console' =>'Вручну (з CLI)', - 'source_periodical' =>'Періодичний', - 'source_webhook_push' =>'Webhook (Push)', - 'source_webhook_pull_request_created' =>'Webhook (створено pull request)', - 'source_webhook_pull_request_updated' =>'Webhook (оновлено pull request) ', - 'source_webhook_pull_request_approved' =>'Webhook (схвалено pull request) ', - 'source_webhook_pull_request_merged' =>'Webhook (об\'єднано pull request) ', - 'group_projects' =>'Групи проектів', - 'project_group' =>'Група проекту', - 'group_count' =>'Кількість проектів', - 'group_edit' =>'Редагувати групу', - 'group_delete' =>'Видалити групу', - 'group_add' =>'Додати групу', - 'group_add_edit' =>'Додати / редагувати групу', - 'group_title' =>'Назва групи', - 'group_save' =>'Зберігти групу', - 'errors' =>'Помилки', - 'information' =>'Інформаця', - 'is_new' =>'Нова?', - 'new' =>'Нова', - 'rebuild_now_debug' =>'Перезібраті в режимі налагодження', - 'all_errors' =>'Всі помилки', - 'only_new' =>'Тільки нові', - 'only_old' =>'Тількі старі', - 'new_errors' =>'Нові помилки', - 'total_errors' =>'Всього помилок', - 'classes' =>'Класів', - 'methods' =>'Методів', - 'coverage' =>'Покриття коду тестами PHPUnit', - 'phan_warnings' =>'Попередження phan', - 'php_cs_fixer_warnings' =>'Попередження PHP CS Fixer', - 'php_cpd_warnings' =>'Попередження PHP Copy/Paste Detector', - 'php_tal_lint_warnings' =>'Попередження PHP Tal Lint', - 'php_tal_lint_errors' =>'Помилки PHP Tal Lint', - 'behat_warnings' =>'Попередження Behat', - 'sensiolabs_insight_warnings' =>'Попередження Sensiolabs Insight', - 'technical_debt_warnings' =>'Попередження Technical Debt', - 'merged_branches' =>'Гілки, що об’єднуються', - 'codeception_feature' =>'Властивість', - 'codeception_suite' =>'Набір', - 'codeception_time' =>'Час', - 'codeception_synopsis' =>'Тестов виконано: %1$d (за %2$f сек.). Невдач : %3$d.', - 'suite' =>'Набір', - 'test' =>'Тест', - 'build-summary' =>'Зведення', - 'stage' =>'Етап', - 'duration' =>'Тривалість', - 'seconds' =>'сек.', - 'plugin' =>'Плагін', - 'stage_setup' =>'Встановлення', - 'stage_test' =>'Тестування', - 'stage_deploy' =>'Розгортання', - 'stage_complete' =>'Завершення', - 'stage_success' =>'Успішне завершення', - 'stage_failure' =>'Невдача', - 'stage_broken' =>'Поломка', - 'stage_fixed' =>'Виправлення', - 'severity' =>'Рівень', - 'all_plugins' =>'Всі плагіни', - 'all_severities' =>'Всі рівні', - 'filters' =>'Фільтри', - 'errors_selected' =>'Помилок вибрано', - 'build_details' =>'Інформація про збірку', - 'commit_details' =>'Інформація про комміт', - 'committer' =>'Автор комміту', - 'commit_message' =>'Повідомлення в комміті', - 'timing' =>'Таймінг', - 'created' =>'Створено', - 'started' =>'Почалося', - 'finished' =>'Закінчено', - 'add_to_queue_failed' =>'Збірка успішно створена, але виникла проблема при додаванні збірки в чергу. Зазвичай таке відбувається, коли PHP Censor намагається працювати з неіснуючим або зупиненим сервером черг Beanstalkd.', - 'critical' =>'Критичний', - 'high' =>'Високий', - 'normal' =>'Нормальний', - 'low' =>'Низький', - 'confirm_message' =>'Елемент буде видалений назавжди. Ви впевнені?', - 'confirm_title' =>'Підтвердження видалення', - 'confirm_ok' =>'Видалити', - 'confirm_cancel' =>'Відміна', - 'confirm_success' =>'Елемент успішно видалений.', - 'confirm_failed' =>'Видалення провалилося! Відповідь сервера: ', - 'public_status_title' =>'Публічний статус', - 'public_status_image' =>'Іконка статусу', - 'public_status_page' =>'Сторінка публічного статусу', -]; + 'overwrite_build_config' => 'Перезаписати конфігурацію файлу в сховищі конфігурацією в базі даних? Якщо прапорець +не встановлено, конфігурація в базі даних буде об’єднана з файлом config.', + 'environments_label' => 'Середовище (yaml)', + 'all' => 'Всі', + 'environment' => 'Середовище', + 'build_source' => 'Джерело збірки', + 'source_unknown' => 'Джерело невідомо', + 'source_manual_web' => 'Вручну (з Інтернету)', + 'source_manual_console' => 'Вручну (з CLI)', + 'source_periodical' => 'Періодичний', + 'source_webhook_push' => 'Webhook (Push)', + 'source_webhook_pull_request_created' => 'Webhook (створено pull request)', + 'source_webhook_pull_request_updated' => 'Webhook (оновлено pull request) ', + 'source_webhook_pull_request_approved' => 'Webhook (схвалено pull request) ', + 'source_webhook_pull_request_merged' => 'Webhook (об\'єднано pull request) ', + 'group_projects' => 'Групи проектів', + 'project_group' => 'Група проекту', + 'group_count' => 'Кількість проектів', + 'group_edit' => 'Редагувати групу', + 'group_delete' => 'Видалити групу', + 'group_add' => 'Додати групу', + 'group_add_edit' => 'Додати / редагувати групу', + 'group_title' => 'Назва групи', + 'group_save' => 'Зберігти групу', + 'errors' => 'Помилки', + 'information' => 'Інформаця', + 'is_new' => 'Нова?', + 'new' => 'Нова', + 'rebuild_now_debug' => 'Перезібраті в режимі налагодження', + 'all_errors' => 'Всі помилки', + 'only_new' => 'Тільки нові', + 'only_old' => 'Тількі старі', + 'new_errors' => 'Нові помилки', + 'total_errors' => 'Всього помилок', + 'classes' => 'Класів', + 'methods' => 'Методів', + 'coverage' => 'Покриття коду тестами PHPUnit', + 'phan_warnings' => 'Попередження phan', + 'php_cs_fixer_warnings' => 'Попередження PHP CS Fixer', + 'php_cpd_warnings' => 'Попередження PHP Copy/Paste Detector', + 'php_tal_lint_warnings' => 'Попередження PHP Tal Lint', + 'php_tal_lint_errors' => 'Помилки PHP Tal Lint', + 'behat_warnings' => 'Попередження Behat', + 'sensiolabs_insight_warnings' => 'Попередження Sensiolabs Insight', + 'technical_debt_warnings' => 'Попередження Technical Debt', + 'merged_branches' => 'Гілки, що об’єднуються', + 'codeception_feature' => 'Властивість', + 'codeception_suite' => 'Набір', + 'codeception_time' => 'Час', + 'codeception_synopsis' => 'Тестов виконано: %1$d (за %2$f сек.). +Невдач : %3$d.', + 'suite' => 'Набір', + 'test' => 'Тест', + 'build-summary' => 'Зведення', + 'stage' => 'Етап', + 'duration' => 'Тривалість', + 'seconds' => 'сек.', + 'plugin' => 'Плагін', + 'stage_setup' => 'Встановлення', + 'stage_test' => 'Тестування', + 'stage_deploy' => 'Розгортання', + 'stage_complete' => 'Завершення', + 'stage_success' => 'Успішне завершення', + 'stage_failure' => 'Невдача', + 'stage_broken' => 'Поломка', + 'stage_fixed' => 'Виправлення', + 'severity' => 'Рівень', + 'all_plugins' => 'Всі плагіни', + 'all_severities' => 'Всі рівні', + 'filters' => 'Фільтри', + 'errors_selected' => 'Помилок вибрано', + 'build_details' => 'Інформація про збірку', + 'commit_details' => 'Інформація про комміт', + 'committer' => 'Автор комміту', + 'commit_message' => 'Повідомлення в комміті', + 'timing' => 'Таймінг', + 'created' => 'Створено', + 'started' => 'Почалося', + 'finished' => 'Закінчено', + 'add_to_queue_failed' => 'Збірка успішно створена, але виникла проблема при додаванні збірки в чергу. +Зазвичай таке відбувається, коли PHP Censor намагається працювати з неіснуючим або зупиненим +сервером черг Beanstalkd.', + 'critical' => 'Критичний', + 'high' => 'Високий', + 'normal' => 'Нормальний', + 'low' => 'Низький', + 'confirm_message' => 'Елемент буде видалений назавжди. Ви впевнені?', + 'confirm_title' => 'Підтвердження видалення', + 'confirm_ok' => 'Видалити', + 'confirm_cancel' => 'Відміна', + 'confirm_success' => 'Елемент успішно видалений.', + 'confirm_failed' => 'Видалення провалилося! Відповідь сервера: ', + 'public_status_title' => 'Публічний статус', + 'public_status_image' => 'Іконка статусу', + 'public_status_page' => 'Сторінка публічного статусу', +]; \ No newline at end of file From 85b400361bef32109f9cfa8743049a4041d1fdfa Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 19 Oct 2021 22:45:57 +0700 Subject: [PATCH 031/212] Fixed documentation for v2.1. --- docs/en/installing.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/en/installing.md b/docs/en/installing.md index 0f4b2d214..1785f71fe 100644 --- a/docs/en/installing.md +++ b/docs/en/installing.md @@ -26,6 +26,10 @@ Or download [latest archive](https://github.com/php-censor/php-censor/releases/l ```bash # For Debian-based aptitude install beanstalkd +# Check if the service is running: +/etc/init.d/beanstalkd status +# If it's not running, start it: +/etc/init.d/beanstalkd start ``` * Install PHP Censor itself: From 27819120083f5c9e19fdb13c27401f8854c5edc2 Mon Sep 17 00:00:00 2001 From: Kieran Date: Thu, 5 Aug 2021 14:13:45 +0100 Subject: [PATCH 032/212] Support plugin option in config --- public/assets/js/build-plugins/summary.js | 9 ++-- src/Languages/lang.en.php | 1 + src/Plugin/Util/Executor.php | 57 +++++++++++++++++------ 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/public/assets/js/build-plugins/summary.js b/public/assets/js/build-plugins/summary.js index ac34acf69..99499bc45 100644 --- a/public/assets/js/build-plugins/summary.js +++ b/public/assets/js/build-plugins/summary.js @@ -35,6 +35,7 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ '' + '' + '' + + '' + '' + '' + '' + @@ -54,9 +55,10 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ tbody.empty(); for (var stage in summary) { - for (var plugin in summary[stage]) { - var data = summary[stage][plugin], - duration = data.started ? ((data.ended || Math.floor(Date.now() / 1000)) - data.started) : '-'; + for (var step in summary[stage]) { + var data = summary[stage][step], + duration = data.started ? ((data.ended || Math.floor(Date.now() / 1000)) - data.started) : '-', + plugin = (typeof data.plugin === "undefined" ? step : data.plugin); var pluginName = Lang.get(plugin); if (0 < data.errors) { @@ -65,6 +67,7 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ tbody.append( '' + '' + + '' + '' + '
          ' + Lang.get('stage') + '' + Lang.get('step') + '' + Lang.get('plugin') + '' + Lang.get('status') + '' + Lang.get('duration') + ' (' + Lang.get('seconds') + ')
          ' + Lang.get('stage_' + stage) + '' + step + '' + pluginName + '' + this.statusLabels[data.status] + diff --git a/src/Languages/lang.en.php b/src/Languages/lang.en.php index af7d89ee1..cc6ce4c84 100644 --- a/src/Languages/lang.en.php +++ b/src/Languages/lang.en.php @@ -347,6 +347,7 @@ // Summary plugin 'build-summary' => 'Summary', 'stage' => 'Stage', + 'step' => 'Step', 'duration' => 'Duration', 'seconds' => 'sec.', 'plugin' => 'Plugin', diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 31e90e787..1de951159 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -166,20 +166,47 @@ protected function doExecutePlugins($plugins, $stage) { $success = true; - foreach ($plugins as $plugin => $options) { + /** + * @deprecated Plugins names "campfire", "telegram", "xmpp", "email", "irc" and "phpstan" are deprecated and will be + * deleted in version 2.0. Use the names "campfire_notify", "telegram_notify", "xmpp_notify", + * "email_notify", "irc_notify" and "php_stan" instead. + */ + $deprecatedNotifyPlugins = [ + 'campfire' => 'campfire_notify', + 'telegram '=> 'telegram_notify', + 'xmpp' => 'xmpp_notify', + 'email' => 'email_notify', + 'irc' => 'irc_notify', + 'phpstan' => 'php_stan', + ]; + + foreach ($plugins as $step => $options) { + + $plugin = $step; + if (isset($options['plugin'])) { + $plugin = $options['plugin']; + } + + if (isset($deprecatedNotifyPlugins[\strtolower($plugin)])) { + $deprecatedPlugin = $plugin; + $plugin = $deprecatedNotifyPlugins[\strtolower($plugin)]; + $this->logger->logWarning( + '[DEPRECATED] Plugins name "' . $deprecatedPlugin . '" is deprecated and will be deleted in version 2.0. Use the name "' . $plugin . '" instead.' + ); + } + $this->logger->log(''); $this->logger->logSuccess( - \sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' . - 'Stage' . ': ' . \ucfirst($stage) . ')' + \sprintf('RUNNING PLUGIN: %s (Step: %s) (Stage: %s)', Lang::get($plugin), $step, \ucfirst($stage)) ); - $this->setPluginStatus($stage, $plugin, Plugin::STATUS_RUNNING); + $this->setPluginStatus($stage, $step, $plugin, Plugin::STATUS_RUNNING); // Try and execute it if ($this->executePlugin($plugin, $options)) { // Execution was successful $this->logger->logSuccess('PLUGIN: SUCCESS'); - $this->setPluginStatus($stage, $plugin, Plugin::STATUS_SUCCESS); + $this->setPluginStatus($stage, $step, $plugin, Plugin::STATUS_SUCCESS); } else { $status = Plugin::STATUS_FAILED; @@ -187,7 +214,8 @@ protected function doExecutePlugins($plugins, $stage) $this->logger->logFailure('PLUGIN: FAILED'); // If we're in the "setup" stage, execution should not continue after // a plugin has failed: - throw new RuntimeException('Plugin failed: ' . $plugin); + + throw new RuntimeException('Plugin failed: ' . $plugin . ' (Step: ' . $step . ')'); } elseif ($stage === Build::STAGE_DEPLOY) { $this->logger->logFailure('PLUGIN: FAILED'); $success = false; @@ -204,7 +232,7 @@ protected function doExecutePlugins($plugins, $stage) } } - $this->setPluginStatus($stage, $plugin, $status); + $this->setPluginStatus($stage, $step, $plugin, $status); } } @@ -246,23 +274,26 @@ public function executePlugin($plugin, $options) * Change the status of a plugin for a given stage. * * @param string $stage The builder stage. + * @param string $step The name of the step * @param string $plugin The plugin name. * @param int $status The new status. */ - protected function setPluginStatus($stage, $plugin, $status) + protected function setPluginStatus($stage, $step, $plugin, $status) { $summary = $this->getBuildSummary(); - if (!isset($summary[$stage][$plugin])) { - $summary[$stage][$plugin] = []; + if (!isset($summary[$stage][$step])) { + $summary[$stage][$step] = [ + 'plugin' => $plugin + ]; } - $summary[$stage][$plugin]['status'] = $status; + $summary[$stage][$step]['status'] = $status; if ($status === Plugin::STATUS_RUNNING) { - $summary[$stage][$plugin]['started'] = \time(); + $summary[$stage][$step]['started'] = \time(); } elseif ($status >= Plugin::STATUS_SUCCESS) { - $summary[$stage][$plugin]['ended'] = \time(); + $summary[$stage][$step]['ended'] = \time(); } $this->setBuildSummary($summary); From e98e71c574e289bfb7d4530325015de727311255 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 22 Oct 2021 22:48:35 +0700 Subject: [PATCH 033/212] Fixes for steps. PR #417. --- src/Plugin/Util/Executor.php | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 1de951159..c0f82a5be 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -165,21 +165,6 @@ protected function getBranchSpecificPlugins($config, $stage, $pluginsToExecute) protected function doExecutePlugins($plugins, $stage) { $success = true; - - /** - * @deprecated Plugins names "campfire", "telegram", "xmpp", "email", "irc" and "phpstan" are deprecated and will be - * deleted in version 2.0. Use the names "campfire_notify", "telegram_notify", "xmpp_notify", - * "email_notify", "irc_notify" and "php_stan" instead. - */ - $deprecatedNotifyPlugins = [ - 'campfire' => 'campfire_notify', - 'telegram '=> 'telegram_notify', - 'xmpp' => 'xmpp_notify', - 'email' => 'email_notify', - 'irc' => 'irc_notify', - 'phpstan' => 'php_stan', - ]; - foreach ($plugins as $step => $options) { $plugin = $step; @@ -187,14 +172,6 @@ protected function doExecutePlugins($plugins, $stage) $plugin = $options['plugin']; } - if (isset($deprecatedNotifyPlugins[\strtolower($plugin)])) { - $deprecatedPlugin = $plugin; - $plugin = $deprecatedNotifyPlugins[\strtolower($plugin)]; - $this->logger->logWarning( - '[DEPRECATED] Plugins name "' . $deprecatedPlugin . '" is deprecated and will be deleted in version 2.0. Use the name "' . $plugin . '" instead.' - ); - } - $this->logger->log(''); $this->logger->logSuccess( \sprintf('RUNNING PLUGIN: %s (Step: %s) (Stage: %s)', Lang::get($plugin), $step, \ucfirst($stage)) From 576367ecec5ad736e0d1843eb7690b46156a06e0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 22 Oct 2021 22:46:49 +0700 Subject: [PATCH 034/212] Fixes for steps. PR #417. --- docs/en/README.md | 1 - docs/en/configuring_project.md | 149 ++++++++++++++---------- docs/en/environments.md | 19 +-- docs/en/plugins/atoum.md | 3 +- docs/en/plugins/behat.md | 3 +- docs/en/plugins/bitbucket_notify.md | 19 +-- docs/en/plugins/campfire_notify.md | 3 +- docs/en/plugins/clean_build.md | 3 +- docs/en/plugins/codeception.md | 6 +- docs/en/plugins/composer.md | 3 +- docs/en/plugins/deployer.md | 3 +- docs/en/plugins/deployer_org.md | 3 +- docs/en/plugins/email_notify.md | 6 +- docs/en/plugins/env.md | 3 +- docs/en/plugins/git.md | 9 +- docs/en/plugins/grunt.md | 3 +- docs/en/plugins/gulp.md | 3 +- docs/en/plugins/hipchat_notify.md | 3 +- docs/en/plugins/lint.md | 3 +- docs/en/plugins/mage.md | 3 +- docs/en/plugins/mage3.md | 3 +- docs/en/plugins/mysql.md | 9 +- docs/en/plugins/pahout.md | 3 +- docs/en/plugins/pdepend.md | 3 +- docs/en/plugins/pgsql.md | 6 +- docs/en/plugins/phan.md | 3 +- docs/en/plugins/phar.md | 3 +- docs/en/plugins/phing.md | 3 +- docs/en/plugins/phlint.md | 3 +- docs/en/plugins/php_code_sniffer.md | 6 +- docs/en/plugins/php_cpd.md | 3 +- docs/en/plugins/php_cs_fixer.md | 9 +- docs/en/plugins/php_docblock_checker.md | 3 +- docs/en/plugins/php_loc.md | 3 +- docs/en/plugins/php_mess_detector.md | 3 +- docs/en/plugins/php_parallel_lint.md | 3 +- docs/en/plugins/php_spec.md | 3 +- docs/en/plugins/php_stan.md | 3 +- docs/en/plugins/php_tal_lint.md | 3 +- docs/en/plugins/php_unit.md | 3 +- docs/en/plugins/psalm.md | 3 +- docs/en/plugins/sensiolabs_insight.md | 3 +- docs/en/plugins/shell.md | 3 +- docs/en/plugins/slack_notify.md | 9 +- docs/en/plugins/sqlite.md | 6 +- docs/en/plugins/telegram_notify.md | 3 +- docs/en/plugins/webhook_notify.md | 9 +- docs/en/plugins/wipe.md | 3 +- docs/en/plugins/xmpp_notify.md | 3 +- docs/en/workarounds.md | 59 ---------- src/Builder.php | 8 +- src/Model/Build.php | 8 +- src/Model/Project.php | 2 +- 53 files changed, 241 insertions(+), 204 deletions(-) delete mode 100644 docs/en/workarounds.md diff --git a/docs/en/README.md b/docs/en/README.md index 31b39eb0e..6a937707f 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -29,7 +29,6 @@ Using PHP Censor * [Periodical builds](periodical_builds.md) * [Console commands](commands.md) * [CCMenu/CCTray integration](ccmenu.md) -* [Known issues and workarounds](workarounds.md) Plugins ------- diff --git a/docs/en/configuring_project.md b/docs/en/configuring_project.md index 4fb3b8b17..2a291d0ea 100644 --- a/docs/en/configuring_project.md +++ b/docs/en/configuring_project.md @@ -26,26 +26,37 @@ There are several ways of configuring build in *PHP Censor* project: ignore: - "vendor" setup: - composer: + composer_step: + plugin: composer action: "install" test: - technical_debt: + technical_debt_step: + plugin: technical_debt allowed_errors: -1 - php_code_sniffer: + php_code_sniffer_step: + plugin: php_code_sniffer allowed_warnings: -1 allowed_errors: -1 - php_mess_detector: + php_mess_detector_step: + plugin: php_mess_detector allowed_warnings: -1 - php_docblock_checker: + php_docblock_checker_step: + plugin: php_docblock_checker allowed_warnings: -1 - security_checker: + security_checker_step: + plugin: security_checker allowed_warnings: -1 - php_parallel_lint: + php_parallel_lint_step: + plugin: php_parallel_lint allow_failures: true - php_loc: - php_cpd: - codeception: - php_unit: + php_loc_step: + plugin: php_loc + php_cpd_step: + plugin: php_cpd + codeception_step: + plugin: codeception + php_unit_step: + plugin: php_unit ``` 2. Adding a config `.php-censor.yml` to the root of the project. @@ -53,9 +64,9 @@ There are several ways of configuring build in *PHP Censor* project: 3. Adding a config via web-interface. By default, a config from web-interface replaces a config from repository (`.php-censor.yml`). But if you uncheck - the option "Replace the configuration from file with the configuration from the data base", configurations will be + the option "Replace the configuration from file with the configuration from the database", configurations will be merged (the config from web-interface will have priority over the config from the repository). - + Setting config via web-interface and merging it with the config from the repo may be useful if you want to hide some secret data (passwords, keys) in case of using public repository. The most of the configuration can be stored as a public file in the repo, and passwords and keys may be added via web-interface. @@ -83,15 +94,19 @@ build_settings: pass: "" setup: - mysql: - - "DROP DATABASE IF EXISTS test;" - - "CREATE DATABASE test;" - - "GRANT ALL PRIVILEGES ON test.* TO test@'localhost' IDENTIFIED BY 'test';" - composer: + mysql_step: + plugin: mysql + queries: + - "DROP DATABASE IF EXISTS test;" + - "CREATE DATABASE test;" + - "GRANT ALL PRIVILEGES ON test.* TO test@'localhost' IDENTIFIED BY 'test';" + composer_step: + plugin: composer action: "install" test: - php_unit: + php_unit_step: + plugin: php_unit config: - "PHPUnit-all.xml" - "PHPUnit-ubuntu-fix.xml" @@ -99,34 +114,41 @@ test: - "tests/" run_from: "phpunit/" coverage: "tests/logs/coverage" - php_mess_detector: + php_mess_detector_step: + plugin: php_mess_detector priority_path: binary_path binary_path: /home/user/sbin/ binary_name: phpmd-local - php_code_sniffer: + php_code_sniffer_step: + plugin: php_code_sniffer standard: "PSR2" - php_cpd: + php_cpd_step: + plugin: php_cpd allow_failures: true - grunt: + grunt_step: + plugin: grunt task: "build" deploy: - deployer: + deployer_step: + plugin: deployer webhook_url: "http://deployer.local/deploy/QZaF1bMIUqbMFTmKDmgytUuykRN0cjCgW9SooTnwkIGETAYhDTTYoR8C431t" reason: "PHP Censor Build #%BUILD_ID% - %COMMIT_MESSAGE%" update_only: true complete: - mysql: - host: "localhost" - user: "root" - pass: "" + mysql_step: + plugin: mysql + host: "localhost" + user: "root" + pass: "" - "DROP DATABASE IF EXISTS test;" branch-dev: run-option: replace test: - grunt: + grunt_step: + plugin: grunt task: "build-dev" ``` @@ -136,11 +158,11 @@ Section `build_settings` contents common build settings: * Option `verbose` enable/disable verbosity of plugins output (Default value: `verbose: true`). -* Option `clone_depth: N` allows to clone repository with partial history (Git clone option `--depth=N`). Option +* Option `clone_depth: N` allows cloning repository with partial history (Git clone option `--depth=N`). Option supports Git (GitHub, GitLab, BitBucket, Gogs) and Svn (Subversion) builds. **ATTENTION!:** Option `clone_depth` should be set only from web-interface (Project edit page) because it should - be known before repository cloning. Also you should understand that some features or plugins with the option may + be known before repository cloning. Also, you should understand that some features or plugins with the option may work with unpredictable result. * Option `directory` sets default directory path for all plugins (It may be overloaded by the plugin option @@ -156,7 +178,8 @@ example config returns ignore list: `vendor, tests, docs`: - tests ... test: - example_plugin: + example_step: + plugin: example_plugin ignore: - ./vendor - ./docs @@ -177,11 +200,11 @@ with lower values (like 2). Default value is 1000. Allowed values range: [1, 200 **ATTENTION!:** Option `build_priority` should be set only from web-interface (Project edit page) because it only has an effect before the repository is cloned. -* Also we have global options (Usually connection settings) for some plugins like: ([Campfire](plugins/campfire_notify.md), +* Also, we have global options (Usually connection settings) for some plugins like: ([Campfire](plugins/campfire_notify.md), [Irc](plugins/irc_notify.md), [Mysql](plugins/mysql.md), [Pgsql](plugins/pgsql.md) и [Sqlite](plugins/sqlite.md)). See documentation of the plugins for more details. -* Also we have options for configuring connection parameters for Svn (Subversion) project source type. For example: +* Also, we have options for configuring connection parameters for Svn (Subversion) project source type. For example: ```yml build_settings: @@ -222,7 +245,7 @@ then - in `priority_path`; * `system` - In the first place search among the system utilities (`/bin`, `/usr/bin` etc., use `which`), then - in `local`, then - in `global`, then - in `priority_path`; - * `binary_path` - First of all, look for the specific path specified in the `binary_path` option, then - in `local`, + * `binary_path` - First look for the specific path specified in the `binary_path` option, then - in `local`, then - in `global`, then - in `system`; The `binary_path` option allows you to set a specific path to the directory with the executable plugin file. There @@ -232,7 +255,8 @@ of strings). Example: ```yml setup: - composer: + composer_step: + plugin: composer priority_path: binary_path binary_path: /home/user/bin/ # Search will be by executable file name: composer-1.4, composer-local, composer, composer.phar @@ -249,7 +273,7 @@ this stage deployment plugins should be called ([Shell](plugins/shell.md), [Depl [Mage](plugins/mage.md) и etc.). This stage is very similar to test. * `complete` - Build completion stage. Always executes after the deploy (or after the test, in case deploy is missing), -regardless of whether the buid was successful or failed. In this stage it is possible to send notifications, to clear +regardless of whether the build was successful or failed. In this stage it is possible to send notifications, to clear a database, etc. * `success` - Successful Build Stage. Called only when the build completed successfully. @@ -279,7 +303,7 @@ for the same purposes (For example: `branch-regex:^feature\-\d$` for the branche **If there are several directives `branch-regex:`/`branch-`, the first directive that matches up with the name of the branch will be used.** -The required parameter `run-option` allows to define, to redefine and to complete the configuration and can take +The required parameter `run-option` allows defining, to redefine and to complete the configuration and can take different values: * `replace` - will cause the branch specific plugins to run and the default ones not. @@ -298,17 +322,20 @@ test branch-regex:^feature\-\d$: run-option: replace test: - grunt: - task: "build-feature" + grunt_step: + plugin: grunt + task: build-feature branch-dev: run-option: replace test: - grunt: - task: "build-dev" + grunt_step: + plugin: grunt + task: build-dev branch-codeception: run-option: after test: - codeception: + codeception_step: + plugin: codeception ``` ### How it works @@ -333,24 +360,27 @@ the [specification](http://yaml.org/spec/1.0/#id2563922). ```yml setup: # yaml comment - shell: - - | - echo a long shell command, multiple lines - scriptPath=%BUILD_PATH%/../../hook-path/prepare-test5.sh - if [ -f $scriptPath ] - then - "$scriptPath" '%PROJECT_ID%' '%PROJECT_TITLE%' # script can read its path from $scriptPath - mkdir ../outputs_to_keep/%COMMIT_ID% - fi - - > - echo this is a very long message I must write here, and it is much too long to allow good editing - on only one line, therefore we break it up onto multiple lines, but the result will be on a single - line. - - echo a short command ... + shell_step: + plugin: shell + commands: + - | + echo a long shell command, multiple lines + scriptPath=%BUILD_PATH%/../../hook-path/prepare-test5.sh + if [ -f $scriptPath ] + then + "$scriptPath" '%PROJECT_ID%' '%PROJECT_TITLE%' # script can read its path from $scriptPath + mkdir ../outputs_to_keep/%COMMIT_ID% + fi + - > + echo this is a very long message I must write here, and it is much too long to allow good editing + on only one line, therefore we break it up onto multiple lines, but the result will be on a single + line. + - echo a short command ... branch-master: complete: &xmpp_notify - xmpp_notify: + xmpp_notify_step: + plugin: xmpp_notify username: &userName "login@gmail.com" password: &password "AZERTY123" recipients: @@ -359,7 +389,8 @@ branch-master: alias: "build infos for project" date_format: "%d/%m/%Y" broken: - xmpp_notify: + xmpp_notify_step: + plugin: xmpp_notify username: *userName password: *password recipients: diff --git a/docs/en/environments.md b/docs/en/environments.md index b02d85fe6..db7d0644a 100644 --- a/docs/en/environments.md +++ b/docs/en/environments.md @@ -24,9 +24,9 @@ In this example, there are three environments: ```yml pr: rc: - - feature-A + - feature-A test: - - feature-B + - feature-B ``` When you push commits to `master` branch, three builds will be created - one for each of the environments. @@ -39,14 +39,17 @@ You can use variable `%ENVIRONMENT%` in project config. ```yml setup: - mysql: - - "DROP DATABASE IF EXISTS project_name_%ENVIRONMENT%;" - - "CREATE DATABASE project_name_%ENVIRONMENT%;" + mysql_step: + plugin: mysql + queries: + - "DROP DATABASE IF EXISTS project_name_%ENVIRONMENT%;" + - "CREATE DATABASE project_name_%ENVIRONMENT%;" test: - ... + ... deploy: - mage: - env: %ENVIRONMENT% + mage_step: + plugin: mage + env: %ENVIRONMENT% ``` diff --git a/docs/en/plugins/atoum.md b/docs/en/plugins/atoum.md index 1e832f4a5..24a882c95 100644 --- a/docs/en/plugins/atoum.md +++ b/docs/en/plugins/atoum.md @@ -15,7 +15,8 @@ Atom binary). ### Examples ```yml test: - atoum: + atoum_step: + plugin: atoum args: "command line arguments go here" config: "path to config file" directory: "directory to run tests" diff --git a/docs/en/plugins/behat.md b/docs/en/plugins/behat.md index b44c93b55..81917a544 100644 --- a/docs/en/plugins/behat.md +++ b/docs/en/plugins/behat.md @@ -14,7 +14,8 @@ Configuration ```yml test: - behat: + behat_step: + plugin: behat executable: "path to behat binary" features: "command line arguments" ``` diff --git a/docs/en/plugins/bitbucket_notify.md b/docs/en/plugins/bitbucket_notify.md index 8a98e07ed..40a0d4180 100644 --- a/docs/en/plugins/bitbucket_notify.md +++ b/docs/en/plugins/bitbucket_notify.md @@ -21,13 +21,14 @@ Configuration ```yml complete: - bitbucket_notify: - url: "https://bitbucket.yourhost.de" - auth_token: "123456" - project_key: "test" - repository_slug: "test-service" - create_task_per_fail: true - create_task_if_fail: false - update_build: true - message: "" + bitbucket_notify_step: + plugin: bitbucket_notify + url: "https://bitbucket.yourhost.de" + auth_token: "123456" + project_key: "test" + repository_slug: "test-service" + create_task_per_fail: true + create_task_if_fail: false + update_build: true + message: "" ``` diff --git a/docs/en/plugins/campfire_notify.md b/docs/en/plugins/campfire_notify.md index 2810c8bf9..088f6b023 100644 --- a/docs/en/plugins/campfire_notify.md +++ b/docs/en/plugins/campfire_notify.md @@ -29,7 +29,8 @@ build_settings: url: "campfire URL" success: - campfire_notify: + campfire_notify_step: + plugin: campfire_notify verbose: true message: "Build succeeded!" ``` diff --git a/docs/en/plugins/clean_build.md b/docs/en/plugins/clean_build.md index 1c5a8c9d5..c2b4cf084 100644 --- a/docs/en/plugins/clean_build.md +++ b/docs/en/plugins/clean_build.md @@ -15,7 +15,8 @@ Configuration ```yml complete: - clean_build: + clean_build_step: + plugin: clean_build remove: - composer.json - composer.phar diff --git a/docs/en/plugins/codeception.md b/docs/en/plugins/codeception.md index 50e2eaf90..4871a8e42 100644 --- a/docs/en/plugins/codeception.md +++ b/docs/en/plugins/codeception.md @@ -35,7 +35,8 @@ processing on line 146. ```yml tests: - codeception: + codeception_step: + plugin: codeception config: "codeception.yml" args: "--no-ansi --coverage-html" ``` @@ -44,7 +45,8 @@ Or ```yml tests: - codeception: + codeception_step: + plugin: codeception config: "subdir1/subdir2" args: "report.xml -vv " output_path: diff --git a/docs/en/plugins/composer.md b/docs/en/plugins/composer.md index 343499ef1..2dd8c1b92 100644 --- a/docs/en/plugins/composer.md +++ b/docs/en/plugins/composer.md @@ -23,7 +23,8 @@ flag (default: false). ```yml setup: - composer: + composer_step: + plugin: composer directory: "my/composer/dir" action: "update" prefer_dist: true diff --git a/docs/en/plugins/deployer.md b/docs/en/plugins/deployer.md index 708269706..c2c9b4b92 100644 --- a/docs/en/plugins/deployer.md +++ b/docs/en/plugins/deployer.md @@ -17,7 +17,8 @@ branches matches the one being built (Default: true). ```yml success: - deployer: + deployer_step: + plugin: deployer webhook_url: "https://deployer.example.com/deploy/QZaF1bMIUqbMFTmKDmgytUuykRN0cjCgW9SooTnwkIGETAYhDTTYoR8C431t" reason: "PHP Censor Build #%BUILD_ID% - %COMMIT_MESSAGE%" update_only: true diff --git a/docs/en/plugins/deployer_org.md b/docs/en/plugins/deployer_org.md index a4a974269..3549ab754 100644 --- a/docs/en/plugins/deployer_org.md +++ b/docs/en/plugins/deployer_org.md @@ -31,7 +31,8 @@ Sample configuration ```yml deploy: - deployer_org: + deployer_org_step: + plugin: deployer_org development: # branch name task: sample-task # optional, default task is deploy stage: dev # required, name of stage or server diff --git a/docs/en/plugins/email_notify.md b/docs/en/plugins/email_notify.md index e73e97209..5d028ab94 100644 --- a/docs/en/plugins/email_notify.md +++ b/docs/en/plugins/email_notify.md @@ -25,7 +25,8 @@ Send an email to the committer as well as one@exameple.com if a build fails: ```yml failure: - email_notify: + email_notify_step: + plugin: email_notify committer: true default_mailto_address: one@example.com ``` @@ -34,6 +35,7 @@ Send an email to one@example.com every time a build is run: ```yml complete: - email_notify: + email_notify_step: + plugin: email_notify default_mailto_address: one@example.com ``` diff --git a/docs/en/plugins/env.md b/docs/en/plugins/env.md index e562ac6b7..4c3ea77fd 100644 --- a/docs/en/plugins/env.md +++ b/docs/en/plugins/env.md @@ -12,6 +12,7 @@ None. ```yml setup: - env: + env_step: + plugin: env APPLICATION_ENV: "development" ``` diff --git a/docs/en/plugins/git.md b/docs/en/plugins/git.md index aff326d5a..0ed63c47a 100644 --- a/docs/en/plugins/git.md +++ b/docs/en/plugins/git.md @@ -10,10 +10,11 @@ Configuration ```yml complete: - git: - master: <-- branch - tag: <-- action - name: "" <-- Action options + git_step: + plugin: git + master: #<-- branch + tag: #<-- action + name: "" #<-- Action options ``` diff --git a/docs/en/plugins/grunt.md b/docs/en/plugins/grunt.md index b017b837f..cdf2f2426 100644 --- a/docs/en/plugins/grunt.md +++ b/docs/en/plugins/grunt.md @@ -15,7 +15,8 @@ Configuration ```yml test: - grunt: + grunt_step: + plugin: grunt directory: "path to run grunt in" gruntfile: "gruntfile.js" task: "css" diff --git a/docs/en/plugins/gulp.md b/docs/en/plugins/gulp.md index 355d32c73..c975882b2 100644 --- a/docs/en/plugins/gulp.md +++ b/docs/en/plugins/gulp.md @@ -15,7 +15,8 @@ Configuration ```yml test: - gulp: + gulp_step: + plugin: gulp directory: "/path/to/run/gulp/from" gulpfile: "gulpfile.js" task: "css" diff --git a/docs/en/plugins/hipchat_notify.md b/docs/en/plugins/hipchat_notify.md index 10ac96733..9bd43e59a 100644 --- a/docs/en/plugins/hipchat_notify.md +++ b/docs/en/plugins/hipchat_notify.md @@ -26,7 +26,8 @@ Message can be formatted via HTML. Example: ```yml success: - hipchat_notify: + hipchat_notify_step: + plugin: hipchat_notify auth_token: 123 room: 456 message: '%PROJECT_TITLE% - build %BUILD_ID% failed!' diff --git a/docs/en/plugins/lint.md b/docs/en/plugins/lint.md index 0ecc5c93f..2e49e11b5 100644 --- a/docs/en/plugins/lint.md +++ b/docs/en/plugins/lint.md @@ -16,7 +16,8 @@ to true). ```yml test: - lint: + lint_step: + plugin: lint directory: "single path to lint files" directories: - "directory to lint files" diff --git a/docs/en/plugins/mage.md b/docs/en/plugins/mage.md index 49b89c7e0..0d8803bc4 100644 --- a/docs/en/plugins/mage.md +++ b/docs/en/plugins/mage.md @@ -16,6 +16,7 @@ Mage must be installed locally in your project as it is not provided by PHP Cens ```yml success: - mage: + mage_step: + plugin: mage env: production ``` diff --git a/docs/en/plugins/mage3.md b/docs/en/plugins/mage3.md index e6bebfecf..67ddce9ae 100644 --- a/docs/en/plugins/mage3.md +++ b/docs/en/plugins/mage3.md @@ -17,6 +17,7 @@ Mage must be installed locally in your project as it is not provided by PHP Cens ```yml success: - mage3: + mage3_step: + plugin: mage3 env: production ``` diff --git a/docs/en/plugins/mysql.md b/docs/en/plugins/mysql.md index fdaec9946..5c907b825 100644 --- a/docs/en/plugins/mysql.md +++ b/docs/en/plugins/mysql.md @@ -34,12 +34,14 @@ build_settings: password: '12345678' setup: - mysql: + mysql_step: + plugin: mysql queries: - "CREATE DATABASE my_app_test;" complete: - mysql: + mysql_step: + plugin: mysql queries: - "DROP DATABASE my_app_test;" ``` @@ -47,7 +49,8 @@ complete: Import SQL from file: ```yml setup: - mysql: + mysql_step: + plugin: mysql imports: - database: "foo" # Database name file: "path/dump.sql" # Relative path in build folder diff --git a/docs/en/plugins/pahout.md b/docs/en/plugins/pahout.md index 81fad1a83..eada24eb3 100644 --- a/docs/en/plugins/pahout.md +++ b/docs/en/plugins/pahout.md @@ -16,7 +16,8 @@ Configuration ```yml test: - pahout: ~ + pahout_step: + plugin: pahout ``` ### Additional Options diff --git a/docs/en/plugins/pdepend.md b/docs/en/plugins/pdepend.md index 9b90e73f7..88ae71f1b 100644 --- a/docs/en/plugins/pdepend.md +++ b/docs/en/plugins/pdepend.md @@ -14,7 +14,8 @@ See additional options below. ```yml test: - pdepend: + pdepend_step: + plugin: pdepend directory: "src" ``` diff --git a/docs/en/plugins/pgsql.md b/docs/en/plugins/pgsql.md index e6e5fa92f..3435e0cf0 100644 --- a/docs/en/plugins/pgsql.md +++ b/docs/en/plugins/pgsql.md @@ -30,12 +30,14 @@ build_settings: password: '12345678' setup: - pgsql: + pgsql_step: + plugin: pgsql queries: - "CREATE DATABASE my_app_test;" complete: - pgsql: + pgsql_step: + plugin: pgsql queries: - "DROP DATABASE my_app_test;" ``` diff --git a/docs/en/plugins/phan.md b/docs/en/plugins/phan.md index 1b5a0e50a..40276bcef 100644 --- a/docs/en/plugins/phan.md +++ b/docs/en/plugins/phan.md @@ -15,7 +15,8 @@ Configuration ```yml test: - phan: + phan_step: + plugin: phan allowed_warnings: 10 directory: "app" ignore: diff --git a/docs/en/plugins/phar.md b/docs/en/plugins/phar.md index ce9a25d05..29b4c11c7 100644 --- a/docs/en/plugins/phar.md +++ b/docs/en/plugins/phar.md @@ -17,7 +17,8 @@ Configuration ```yml test: - phar: + phar_step: + plugin: phar directory: /path/to/directory filename: foobar.phar regexp: /\.(php|phtml)$/ diff --git a/docs/en/plugins/phing.md b/docs/en/plugins/phing.md index ef6119309..6f00fb04e 100644 --- a/docs/en/plugins/phing.md +++ b/docs/en/plugins/phing.md @@ -17,7 +17,8 @@ Configuration ```yml setup: - phing: + phing_step: + plugin: phing build_file: 'build.xml' targets: - "build:test" diff --git a/docs/en/plugins/phlint.md b/docs/en/plugins/phlint.md index faa9ada8b..31b027bc4 100644 --- a/docs/en/plugins/phlint.md +++ b/docs/en/plugins/phlint.md @@ -19,7 +19,8 @@ Configuration ```yml test: - phlint: ~ + phlint_step: + plugin: phlint ``` ### Additional Options diff --git a/docs/en/plugins/php_code_sniffer.md b/docs/en/plugins/php_code_sniffer.md index 7bb0547a9..ffe4bd322 100644 --- a/docs/en/plugins/php_code_sniffer.md +++ b/docs/en/plugins/php_code_sniffer.md @@ -27,7 +27,8 @@ validation: ```yml test: - php_code_sniffer: + php_code_sniffer_step: + plugin: php_code_sniffer directory: "app" ignore: - "app/views" @@ -37,7 +38,8 @@ test: For use with an existing project: ```yml test: - php_code_sniffer: + php_code_sniffer_step: + plugin: php_code_sniffer standard: "./phpcs.xml" allowed_errors: -1 # Even a single error will cause the build to fail. -1 = unlimited allowed_warnings: -1 diff --git a/docs/en/plugins/php_cpd.md b/docs/en/plugins/php_cpd.md index 353cb3306..fd78fbf5a 100644 --- a/docs/en/plugins/php_cpd.md +++ b/docs/en/plugins/php_cpd.md @@ -10,7 +10,8 @@ Configuration ```yml test: - php_cpd: + php_cpd_step: + plugin: php_cpd directory: "app" ignore: - "app/my/path" diff --git a/docs/en/plugins/php_cs_fixer.md b/docs/en/plugins/php_cs_fixer.md index 0cbc6875b..f1d6bed8d 100644 --- a/docs/en/plugins/php_cs_fixer.md +++ b/docs/en/plugins/php_cs_fixer.md @@ -23,14 +23,16 @@ Configuration ```yml test: - php_cs_fixer: + php_cs_fixer_step: + plugin: php_cs_fixer directory: "./my/dir/path" # == "%BUILD_PATH%/my/dir/path" args: "--rules=@PSR12 --diff --verbose" ``` ```yml test: - php_cs_fixer: + php_cs_fixer_step: + plugin: php_cs_fixer directory: "%BUILD_PATH%/my/dir/path" verbose: true diff: true @@ -39,7 +41,8 @@ test: ```yml test: - php_cs_fixer: + php_cs_fixer_step: + plugin: php_cs_fixer config: "./my/dir/.php_cs.special" ``` diff --git a/docs/en/plugins/php_docblock_checker.md b/docs/en/plugins/php_docblock_checker.md index 2f64a194b..1c36470f4 100644 --- a/docs/en/plugins/php_docblock_checker.md +++ b/docs/en/plugins/php_docblock_checker.md @@ -18,7 +18,8 @@ Configuration ```yml test: - php_docblock_checker: + php_docblock_checker_step: + plugin: php_docblock_checker allowed_warnings: 10 skip_classes: true ``` diff --git a/docs/en/plugins/php_loc.md b/docs/en/plugins/php_loc.md index 393d0ddec..30ea540a5 100644 --- a/docs/en/plugins/php_loc.md +++ b/docs/en/plugins/php_loc.md @@ -17,7 +17,8 @@ included outside of the app directory. ```yml test: - php_loc: + php_loc_step: + plugin: php_loc directory: "app" ``` diff --git a/docs/en/plugins/php_mess_detector.md b/docs/en/plugins/php_mess_detector.md index 7aa88f3cb..28bdba1df 100644 --- a/docs/en/plugins/php_mess_detector.md +++ b/docs/en/plugins/php_mess_detector.md @@ -19,7 +19,8 @@ details on the rules. (default: ['codesize', 'unusedcode', 'naming']). ```yml test: - php_mess_detector: + php_mess_detector_step: + plugin: php_mess_detector directory: 'app' ignore: - 'vendor' diff --git a/docs/en/plugins/php_parallel_lint.md b/docs/en/plugins/php_parallel_lint.md index 23a64e36a..6edabe916 100644 --- a/docs/en/plugins/php_parallel_lint.md +++ b/docs/en/plugins/php_parallel_lint.md @@ -15,7 +15,8 @@ See additional options below. ```yml test: - php_parallel_lint: + php_parallel_lint_step: + plugin: php_parallel_lint directory: "app" ignore: - "vendor" diff --git a/docs/en/plugins/php_spec.md b/docs/en/plugins/php_spec.md index e3f3e4365..28607206b 100644 --- a/docs/en/plugins/php_spec.md +++ b/docs/en/plugins/php_spec.md @@ -14,7 +14,8 @@ See additional options below. ```yml test: - php_spec: ~ + php_spec_step: + plugin: php_spec ``` ### Additional Options diff --git a/docs/en/plugins/php_stan.md b/docs/en/plugins/php_stan.md index 1522eee33..bae5109b3 100644 --- a/docs/en/plugins/php_stan.md +++ b/docs/en/plugins/php_stan.md @@ -20,7 +20,8 @@ Configuration ```yml test: - php_stan: + php_stan_step: + plugin: php_stan directories: - src - tests diff --git a/docs/en/plugins/php_tal_lint.md b/docs/en/plugins/php_tal_lint.md index 49bf88081..b4cfaf19b 100644 --- a/docs/en/plugins/php_tal_lint.md +++ b/docs/en/plugins/php_tal_lint.md @@ -22,7 +22,8 @@ errors. ```yml test: - php_tal_lint: + php_tal_lint_step: + plugin: php_tal_lint directory: "app" ignore: - "vendor" diff --git a/docs/en/plugins/php_unit.md b/docs/en/plugins/php_unit.md index ec7a9a229..8cdd71698 100644 --- a/docs/en/plugins/php_unit.md +++ b/docs/en/plugins/php_unit.md @@ -33,7 +33,8 @@ Both modes accept: Specify config file and test directory: ```yml test: - php_unit: + php_unit_step: + plugin: php_unit config: - "path/to/phpunit.xml" directories: diff --git a/docs/en/plugins/psalm.md b/docs/en/plugins/psalm.md index 6d3b940c1..e5a7a247a 100644 --- a/docs/en/plugins/psalm.md +++ b/docs/en/plugins/psalm.md @@ -17,7 +17,8 @@ Configuration ```yml test: - psalm: ~ + psalm_step: + plugin: psalm ``` ### Additional Options diff --git a/docs/en/plugins/sensiolabs_insight.md b/docs/en/plugins/sensiolabs_insight.md index c388cb49a..8d456ccaa 100644 --- a/docs/en/plugins/sensiolabs_insight.md +++ b/docs/en/plugins/sensiolabs_insight.md @@ -18,7 +18,8 @@ Configuration ```yml test: - sensiolabs_insight: + sensiolabs_insight_step: + plugin: sensiolabs_insight allow_failures: true user_uuid: 'xxx-xxx-xxx-xxx-xxx' auth_token: 'xxxx' diff --git a/docs/en/plugins/shell.md b/docs/en/plugins/shell.md index 09d7e6136..b18120999 100644 --- a/docs/en/plugins/shell.md +++ b/docs/en/plugins/shell.md @@ -14,7 +14,8 @@ failed. ```yml setup: - shell: + shell_step: + plugin: shell execute_all: true commands: - "[ -d /www ]" diff --git a/docs/en/plugins/slack_notify.md b/docs/en/plugins/slack_notify.md index 642787a3b..b6dc96529 100644 --- a/docs/en/plugins/slack_notify.md +++ b/docs/en/plugins/slack_notify.md @@ -26,7 +26,8 @@ Send a message if the build fails: ```yml failure: - slack_notify: + slack_notify_step: + plugin: slack_notify webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" room: "#php-censor" username: "PHP Censor" @@ -39,7 +40,8 @@ Send a message if the build is successful: ```yml success: - slack_notify: + slack_notify_step: + plugin: slack_notify webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" room: "#php-censor" username: "PHP Censor" @@ -52,7 +54,8 @@ Send a message every time the build runs: ```yml complete: - slack_notify: + slack_notify_step: + plugin: slack_notify webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg" room: "#php-censor" username: "PHP Censor" diff --git a/docs/en/plugins/sqlite.md b/docs/en/plugins/sqlite.md index f65cce04d..64d1b4643 100644 --- a/docs/en/plugins/sqlite.md +++ b/docs/en/plugins/sqlite.md @@ -24,12 +24,14 @@ build_settings: path: '/path/to/sqlite.sqlite' setup: - sqlite: + sqlite_step: + plugin: sqlite queries: - "CREATE DATABASE my_app_test;" complete: - sqlite: + sqlite_step: + plugin: sqlite queries: - "DROP DATABASE my_app_test;" ``` diff --git a/docs/en/plugins/telegram_notify.md b/docs/en/plugins/telegram_notify.md index 5d86669c8..105ec4718 100644 --- a/docs/en/plugins/telegram_notify.md +++ b/docs/en/plugins/telegram_notify.md @@ -17,7 +17,8 @@ In the PHP Censor Project config section add the Telegram trigger ```yml complete: - telegram_notify: + telegram_notify_step: + plugin: telegram_notify auth_token: "" message: "[%ICON_BUILD%] [%PROJECT_TITLE%](%PROJECT_LINK%) - [Build #%BUILD_ID%](%BUILD_LINK%) has finished for commit [%SHORT_COMMIT_ID% (%COMMITTER_EMAIL%)](%COMMIT_LINK%) on branch [%BRANCH%](%BRANCH_LINK%)" recipients: diff --git a/docs/en/plugins/webhook_notify.md b/docs/en/plugins/webhook_notify.md index f5cdc2ec1..0443d831b 100644 --- a/docs/en/plugins/webhook_notify.md +++ b/docs/en/plugins/webhook_notify.md @@ -18,7 +18,8 @@ Send a message if the build fails: ```yml failure: - webhook_notify: + webhook_notify_step: + plugin: webhook_notify url: "http://example.com/webhook-handler" ``` @@ -26,7 +27,8 @@ Send a message if the build is successful: ```yml success: - webhook_notify: + webhook_notify_step: + plugin: webhook_notify url: "http://example.com/webhook-handler" ``` @@ -34,6 +36,7 @@ Send a message every time the build runs: ```yml complete: - webhook_notify: + webhook_notify_step: + plugin: webhook_notify url: "http://example.com/webhook-handler" ``` diff --git a/docs/en/plugins/wipe.md b/docs/en/plugins/wipe.md index 4361f98f8..5fee37de4 100644 --- a/docs/en/plugins/wipe.md +++ b/docs/en/plugins/wipe.md @@ -14,6 +14,7 @@ Configuration ```yml complete: - wipe: + wipe_step: + plugin: wipe directory: "/path/to/directory" ``` diff --git a/docs/en/plugins/xmpp_notify.md b/docs/en/plugins/xmpp_notify.md index 912d74b2d..8b4b2c4a5 100644 --- a/docs/en/plugins/xmpp_notify.md +++ b/docs/en/plugins/xmpp_notify.md @@ -29,7 +29,8 @@ Configuration ```yml complete: - xmpp_notify: + xmpp_notify_step: + plugin: xmpp_notify username: "login@gmail.com" password: "AZERTY123" recipients: diff --git a/docs/en/workarounds.md b/docs/en/workarounds.md deleted file mode 100644 index 38209d53e..000000000 --- a/docs/en/workarounds.md +++ /dev/null @@ -1,59 +0,0 @@ -Known issues and workarounds -============================ - -PhpLoc with PHP < 7.2 and XDebug > 3.0 --------------------------------------- - -If you are should support version of PHP < 7.2 with XDebug version > 3.0, you may patch PHPLoc 4.0.1 (Latest PHPLoc -version with PHP < 7.2 support) for support XDebug > 3.0. Do following: - -1. Install plugin `composer-patches` for patching dependencies: - -```bash -composer require cweagans/composer-patches -``` - -2. Configure patching in `composer.json`: - -```json -{ - ... - "config": { - "preferred-install": "source" - }, - "extra": { - "patches": { - "phploc/phploc": { - "PhpLoc4 XDebug3 Fix": "/phploc4-xdebug3-fix.patch" - } - }, - "enable-patching": true - }, - ... -} -``` - -3. Create patch file (For example: `phploc4-xdebug3-fix.patch`): - -``` -diff --git a/src/CLI/Application.php b/src/CLI/Application.php -index faab87f..fa5c87d 100644 ---- a/src/CLI/Application.php -+++ b/src/CLI/Application.php -@@ -109,6 +109,8 @@ private function disableXdebug() - \ini_set('xdebug.show_exception_trace', 0); - \ini_set('xdebug.show_error_trace', 0); - -- \xdebug_disable(); -+ if (\function_exists('xdebug_disable')) { -+ \xdebug_disable(); -+ } - } - } -``` - -4. Update dependencies: - -```bash -composer update -``` diff --git a/src/Builder.php b/src/Builder.php index e0bb9ce7e..af722da30 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -178,10 +178,10 @@ public function execute(): void $success = true; $previousBuild = $this->build->getProject()->getPreviousBuild($this->build->getBranch()); - $previousState = Build::STATUS_PENDING; + $previousBuildStatus = Build::STATUS_PENDING; if ($previousBuild) { - $previousState = $previousBuild->getStatus(); + $previousBuildStatus = $previousBuild->getStatus(); } try { @@ -215,7 +215,7 @@ public function execute(): void $this->currentStage = Build::STAGE_SUCCESS; $this->pluginExecutor->executePlugins($this->config, Build::STAGE_SUCCESS); - if (Build::STATUS_FAILED === $previousState) { + if (Build::STATUS_FAILED === $previousBuildStatus) { $this->currentStage = Build::STAGE_FIXED; $this->pluginExecutor->executePlugins($this->config, Build::STAGE_FIXED); } @@ -223,7 +223,7 @@ public function execute(): void $this->currentStage = Build::STAGE_FAILURE; $this->pluginExecutor->executePlugins($this->config, Build::STAGE_FAILURE); - if (Build::STATUS_SUCCESS === $previousState || Build::STATUS_PENDING === $previousState) { + if (Build::STATUS_SUCCESS === $previousBuildStatus || Build::STATUS_PENDING === $previousBuildStatus) { $this->currentStage = Build::STAGE_BROKEN; $this->pluginExecutor->executePlugins($this->config, Build::STAGE_BROKEN); } diff --git a/src/Model/Build.php b/src/Model/Build.php index 062e413d0..0af137c84 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -343,15 +343,19 @@ protected function getZeroConfigPlugins() foreach ([Build::STAGE_SETUP, Build::STAGE_TEST] as $stage) { if ($className::canExecuteOnStage($stage, $this)) { + $pluginName = $className::pluginName(); + $stepName = \sprintf('%s_step', $pluginName); + $pluginConfig = [ + 'plugin' => $pluginName, 'zero_config' => true, ]; - if (PhpParallelLint::pluginName() === $className::pluginName()) { + if (PhpParallelLint::pluginName() === $pluginName) { $pluginConfig['allow_failures'] = true; } - $config[$stage][$className::pluginName()] = $pluginConfig; + $config[$stage][$stepName] = $pluginConfig; } } } diff --git a/src/Model/Project.php b/src/Model/Project.php index 58b6a5daa..cc0dd095b 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -87,7 +87,7 @@ public function getPreviousBuild($branch) { $criteria = [ 'branch' => $branch, - 'project_id' => $this->getId() + 'project_id' => $this->getId(), ]; $order = ['id' => 'DESC']; $builds = $this->storeRegistry->get('Build')->getWhere($criteria, 1, 1, $order); From 3087691641a0dd738fe693c55fecca69b0c015da Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 6 Jan 2022 23:18:04 +0700 Subject: [PATCH 035/212] .gitignore small fix. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 81c025d4a..057ce5743 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /composer.phar /vendor -/.php_cs.cache +/.php-cs-fixer.cache /.phpunit.result.cache /app/config.yml From d84b2aa0474d262dd6f8ca651516f0b3697f934e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 9 Jan 2022 22:41:01 +0700 Subject: [PATCH 036/212] Code style fixes. --- src/Application.php | 14 +-- src/BuildFactory.php | 14 +-- src/Builder.php | 25 +---- src/Command/Action/CreateAdmin.php | 2 +- src/Command/CheckLocalizationCommand.php | 4 +- src/Command/Command.php | 7 +- src/Command/CreateAdminCommand.php | 2 +- src/Command/CreateBuildCommand.php | 4 +- src/Command/InstallCommand.php | 13 +-- src/Command/RebuildQueueCommand.php | 2 +- src/Command/RemoveOldBuildsCommand.php | 2 +- src/Command/WorkerCommand.php | 3 +- src/Configuration.php | 10 +- src/ConfigurationInterface.php | 2 +- src/Console/Application.php | 2 +- src/Controller.php | 11 +-- src/Controller/BuildController.php | 32 +------ src/Controller/BuildStatusController.php | 35 +------ src/Controller/GroupController.php | 8 +- src/Controller/HomeController.php | 2 +- src/Controller/ProjectController.php | 21 +---- src/Controller/SessionController.php | 13 +-- src/Controller/UserController.php | 19 +--- src/Controller/WebhookController.php | 61 ++----------- .../WidgetAllProjectsController.php | 12 +-- .../WidgetBuildErrorsController.php | 8 +- src/Controller/WidgetLastBuildsController.php | 5 +- src/DatabaseConnection.php | 11 +-- src/DatabaseManager.php | 10 +- src/Exception/HttpException.php | 2 +- .../HttpException/BadRequestException.php | 2 +- .../HttpException/ForbiddenException.php | 2 +- .../HttpException/NotAuthorizedException.php | 2 +- .../HttpException/NotFoundException.php | 2 +- .../HttpException/ServerErrorException.php | 2 +- src/Form.php | 2 +- src/Form/ControlGroup.php | 2 +- .../DataTransformerInterface.php | 2 +- src/Form/DataTransformer/Yaml.php | 2 +- src/Form/Element.php | 2 +- src/Form/Element/Button.php | 2 +- src/Form/Element/Checkbox.php | 8 +- src/Form/Element/CheckboxGroup.php | 2 +- src/Form/Element/Csrf.php | 2 +- src/Form/Element/Email.php | 2 +- src/Form/Element/Hidden.php | 2 +- src/Form/Element/Password.php | 2 +- src/Form/Element/Radio.php | 2 +- src/Form/Element/Select.php | 2 +- src/Form/Element/Submit.php | 2 +- src/Form/Element/Text.php | 2 +- src/Form/Element/TextArea.php | 2 +- src/Form/Element/Url.php | 4 +- src/Form/FieldSet.php | 5 +- src/Form/Input.php | 5 +- src/Form/Validator/ValidatorInterface.php | 2 +- src/Form/Validator/Yaml.php | 2 +- src/Helper/Email.php | 3 - src/Helper/Lang.php | 2 + src/Http/Router.php | 3 - src/Languages/lang.uk.php | 2 +- src/Logging/AnsiFormatter.php | 2 +- src/Logging/BuildDBLogHandler.php | 5 +- src/Logging/BuildLogger.php | 2 +- src/Logging/Handler.php | 7 +- src/Logging/OutputLogHandler.php | 2 +- src/Model.php | 2 +- src/Model/Base/Build.php | 2 +- src/Model/Base/BuildError.php | 2 +- src/Model/Base/BuildMeta.php | 2 +- src/Model/Base/Environment.php | 2 +- src/Model/Base/Project.php | 2 +- src/Model/Base/ProjectGroup.php | 2 +- src/Model/Base/User.php | 2 +- src/Model/Build.php | 6 -- src/Plugin/Mysql.php | 2 +- src/Plugin/Option/PhpUnitOptions.php | 5 - src/Plugin/Phan.php | 1 + src/Plugin/PhpCodeSniffer.php | 1 + src/Plugin/PhpCpd.php | 1 + src/Plugin/PhpCsFixer.php | 1 + src/Plugin/PhpMessDetector.php | 1 + src/Plugin/Util/Executor.php | 1 - src/Plugin/Util/Factory.php | 2 +- .../LoginPasswordProviderInterface.php | 2 +- src/Security/Authentication/Service.php | 4 +- .../UserProvider/AbstractProvider.php | 2 +- .../Authentication/UserProvider/Internal.php | 7 +- .../Authentication/UserProvider/Ldap.php | 6 +- .../Authentication/UserProviderInterface.php | 2 +- src/Service/BuildService.php | 30 +----- src/Service/BuildStatusService.php | 40 +------- src/Service/ProjectService.php | 21 +---- src/Service/UserService.php | 13 +-- src/Store.php | 28 +----- src/Store/BuildErrorStore.php | 45 +-------- src/Store/BuildErrorWriter.php | 25 +---- src/Store/BuildMetaStore.php | 27 +----- src/Store/BuildStore.php | 91 +------------------ src/Store/EnvironmentStore.php | 23 +---- src/Store/ProjectGroupStore.php | 17 +--- src/Store/ProjectStore.php | 32 +------ src/Store/UserStore.php | 26 +----- src/StoreRegistry.php | 6 +- src/View.php | 8 +- src/WebController.php | 11 +-- src/Worker/BuildWorker.php | 2 +- tests/src/ConfigurationTest.php | 2 +- tests/src/DatabaseConnectionTest.php | 2 +- tests/src/Logging/AnsiFormatterTest.php | 2 +- tests/src/Logging/OutputLogHandlerTest.php | 2 +- tests/src/Plugin/Util/FactoryTest.php | 2 +- tests/src/StoreRegistryTest.php | 2 +- tests/src/ViewTest.php | 2 +- 114 files changed, 129 insertions(+), 842 deletions(-) diff --git a/src/Application.php b/src/Application.php index b57811747..9a413d26b 100644 --- a/src/Application.php +++ b/src/Application.php @@ -1,6 +1,6 @@ "This is build 182" - * - * @param string $input - * - * @return string */ public function interpolate(string $input): string { @@ -356,8 +337,6 @@ public function interpolate(string $input): string * Set up a working copy of the project for building. * * @throws Exception - * - * @return bool */ protected function setupBuild(): bool { @@ -458,8 +437,6 @@ public function logDebug(string $message): void /** * Returns a configured instance of the plugin factory. - * - * @return PluginFactory */ private function buildPluginFactory(Build $build): PluginFactory { diff --git a/src/Command/Action/CreateAdmin.php b/src/Command/Action/CreateAdmin.php index 3df6dea35..ac3b785ce 100644 --- a/src/Command/Action/CreateAdmin.php +++ b/src/Command/Action/CreateAdmin.php @@ -1,6 +1,6 @@ getArgument('projectId'); + $projectId = (int)$input->getArgument('projectId'); $commitId = $input->getOption('commit'); $branch = $input->getOption('branch'); $environment = $input->hasOption('environment') ? $input->getOption('environment') : null; diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index 1143215cd..4a4aa5f84 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -1,6 +1,6 @@ create($admin); } - /** - * @param OutputInterface $output - */ protected function createDefaultGroup(OutputInterface $output): void { try { diff --git a/src/Command/RebuildQueueCommand.php b/src/Command/RebuildQueueCommand.php index 464026a3a..7a121a5b8 100644 --- a/src/Command/RebuildQueueCommand.php +++ b/src/Command/RebuildQueueCommand.php @@ -1,6 +1,6 @@ getParam('branch', ''); @@ -90,10 +85,6 @@ public function ajaxBuilds(int $projectId): Response /** * View a specific project. * - * @param int $projectId - * - * @return string - * * @throws NotFoundException * @throws PHPCensor\Exception\HttpException * @throws RuntimeException @@ -152,16 +143,6 @@ public function view(int $projectId): string return $this->view->render(); } - /** - * @param int $projectId - * @param string $branch - * @param string $environment - * @param int $total - * @param int $perPage - * @param int $page - * - * @return string - */ protected function getPaginatorHtml( int $projectId, string $branch, diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index bd549ceb9..d0c654115 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -1,6 +1,6 @@ buildService->createBuild( $project, - $environmentId, + (int)$environmentId, $commitId, $project->getDefaultBranch(), $tag, $committer, $commitMessage, - (int)$source, + $source, null, $extra ); @@ -213,7 +208,7 @@ protected function createBuild( 'environment' => $environmentId, ]; } else { - $duplicates[] = \array_search($environmentId, $ignoreEnvironments); + $duplicates[] = \array_search($environmentId, $ignoreEnvironments, true); } } @@ -278,8 +273,6 @@ protected function createBuild( * * @param int $projectId id or title of project * - * @return Project - * * @throws Exception If the project does not exist or is not of the expected type. */ protected function fetchProject(int $projectId, array $expectedType): Project @@ -291,7 +284,7 @@ protected function fetchProject(int $projectId, array $expectedType): Project if (\is_numeric($projectId)) { $project = $this->projectStore->getById((int)$projectId); } else { - $projects = $this->projectStore->getByTitle($projectId, 2); + $projects = $this->projectStore->getByTitle((string)$projectId, 2); if ($projects['count'] < 1) { throw new NotFoundException('Project does not found: ' . $projectId); } @@ -311,10 +304,6 @@ protected function fetchProject(int $projectId, array $expectedType): Project /** * Called by POSTing to /webhook/git/?branch=&commit= * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function git(int $projectId): array @@ -345,10 +334,6 @@ public function git(int $projectId): array /** * Called by POSTing to /webhook/hg/?branch=&commit= * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function hg(int $projectId): array @@ -378,10 +363,6 @@ public function hg(int $projectId): array * * @author Sylvain Lévesque * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function svn(int $projectId): array @@ -408,10 +389,6 @@ public function svn(int $projectId): array /** * Called by Bitbucket. * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function bitbucket(int $projectId): array @@ -455,8 +432,6 @@ public function bitbucket(int $projectId): array /** * Handle the payload when Bitbucket sends a commit webhook. - * - * @return array */ protected function bitbucketCommitRequest(Project $project, array $payload): array { @@ -494,8 +469,6 @@ protected function bitbucketCommitRequest(Project $project, array $payload): arr /** * Handle the payload when Bitbucket sends a Pull Request webhook. * - * @return array - * * @throws Exception */ protected function bitbucketPullRequest(Project $project, array $payload): array @@ -582,8 +555,6 @@ protected function bitbucketPullRequest(Project $project, array $payload): array /** * Handle the payload when Bitbucket Server sends a Pull Request webhook. * - * @return array - * * @throws Exception */ protected function bitbucketSvrPullRequest(Project $project, array $payload): array @@ -634,8 +605,6 @@ protected function bitbucketSvrPullRequest(Project $project, array $payload): ar /** * Bitbucket POST service. - * - * @return array */ protected function bitbucketService(array $payload, Project $project): array { @@ -666,10 +635,6 @@ protected function bitbucketService(array $payload, Project $project): array } /** - * @param int $projectId - * - * @return array - * * @throws Exception */ public function github(int $projectId): array @@ -709,8 +674,6 @@ public function github(int $projectId): array /** * Handle the payload when Github sends a commit webhook. - * - * @return array */ protected function githubCommitRequest(Project $project, array $payload): array { @@ -765,8 +728,6 @@ protected function githubCommitRequest(Project $project, array $payload): array /** * Handle the payload when Github sends a Pull Request webhook. * - * @return array - * * @throws Exception */ protected function githubPullRequest(Project $project, array $payload): array @@ -856,10 +817,6 @@ protected function githubPullRequest(Project $project, array $payload): array /** * Called by Gitlab Webhooks: * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function gitlab(int $projectId): array @@ -926,8 +883,6 @@ public function gitlab(int $projectId): array /** * @param string $projectId * - * @return array - * * @throws Exception */ public function gogs(int $projectId): array @@ -964,8 +919,6 @@ public function gogs(int $projectId): array /** * Handle the payload when Gogs sends a commit webhook. - * - * @return array */ protected function gogsCommitRequest(Project $project, array $payload): array { @@ -1001,8 +954,6 @@ protected function gogsCommitRequest(Project $project, array $payload): array /** * Handle the payload when Gogs sends a pull request webhook. * - * @return array - * * @throws InvalidArgumentException */ protected function gogsPullRequest(Project $project, array $payload): array diff --git a/src/Controller/WidgetAllProjectsController.php b/src/Controller/WidgetAllProjectsController.php index a79ae493a..cffbf06a5 100644 --- a/src/Controller/WidgetAllProjectsController.php +++ b/src/Controller/WidgetAllProjectsController.php @@ -1,6 +1,6 @@ buildStore->getLatestBuilds(null, 10); diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php index 5cab37df9..4ae6fd821 100644 --- a/src/DatabaseConnection.php +++ b/src/DatabaseConnection.php @@ -1,6 +1,6 @@ value = $this->getValue(); diff --git a/src/Form/Validator/ValidatorInterface.php b/src/Form/Validator/ValidatorInterface.php index eeda83ba2..270a4247e 100644 --- a/src/Form/Validator/ValidatorInterface.php +++ b/src/Form/Validator/ValidatorInterface.php @@ -1,6 +1,6 @@ config = $config; diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index fb084afea..b04c78eda 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -50,9 +50,11 @@ public static function get(...$params) $string = $params[0]; if (\array_key_exists($string, self::$strings)) { $params[0] = self::$strings[$string]; + return \call_user_func_array('sprintf', $params); } elseif (self::DEFAULT_LANGUAGE !== self::$language && \array_key_exists($string, self::$defaultStrings)) { $params[0] = self::$defaultStrings[$string]; + return \call_user_func_array('sprintf', $params); } diff --git a/src/Http/Router.php b/src/Http/Router.php index c585b4794..dfe552162 100644 --- a/src/Http/Router.php +++ b/src/Http/Router.php @@ -19,9 +19,6 @@ class Router */ protected Request $request; - /** - * @var Application - */ protected Application $application; /** diff --git a/src/Languages/lang.uk.php b/src/Languages/lang.uk.php index ab5167b54..bd90a8fce 100644 --- a/src/Languages/lang.uk.php +++ b/src/Languages/lang.uk.php @@ -401,4 +401,4 @@ 'public_status_title' => 'Публічний статус', 'public_status_image' => 'Іконка статусу', 'public_status_page' => 'Сторінка публічного статусу', -]; \ No newline at end of file +]; diff --git a/src/Logging/AnsiFormatter.php b/src/Logging/AnsiFormatter.php index 0b6930938..de95098c2 100644 --- a/src/Logging/AnsiFormatter.php +++ b/src/Logging/AnsiFormatter.php @@ -1,6 +1,6 @@ \escapeshellarg($this->host), ':user' => \escapeshellarg($this->user), ':pass' => (!$this->password) ? '' : '-p' . \escapeshellarg($this->password), - ':database' => ($database === null)? '' : \escapeshellarg($database), + ':database' => ($database === null) ? '' : \escapeshellarg($database), ]; return strtr('cat :import_file :decomp_cmd | mysql -h:host -u:user :pass :database', $args); diff --git a/src/Plugin/Option/PhpUnitOptions.php b/src/Plugin/Option/PhpUnitOptions.php index c0d703e8b..17426cfc7 100644 --- a/src/Plugin/Option/PhpUnitOptions.php +++ b/src/Plugin/Option/PhpUnitOptions.php @@ -23,11 +23,6 @@ class PhpUnitOptions protected ConfigurationInterface $configuration; - /** - * @param ConfigurationInterface $configuration - * @param array $options - * @param string $location - */ public function __construct(ConfigurationInterface $configuration, array $options, string $location) { $this->configuration = $configuration; diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index 133d83d6c..3d688cb40 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -110,6 +110,7 @@ protected function processReport($jsonString) if ($json === false || !\is_array($json)) { $this->builder->log($jsonString); + throw new RuntimeException('Could not process the report generated by Phan.'); } diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index efc5d544f..8e4c7cf08 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -246,6 +246,7 @@ protected function processReport($output) if (!\is_array($data)) { $this->builder->log($output); + throw new RuntimeException('Could not process the report generated by PHP Code Sniffer.'); } diff --git a/src/Plugin/PhpCpd.php b/src/Plugin/PhpCpd.php index 6dff22d85..4b33c753a 100644 --- a/src/Plugin/PhpCpd.php +++ b/src/Plugin/PhpCpd.php @@ -114,6 +114,7 @@ protected function processReport($xmlString) if (false === $xml) { $this->builder->log($xmlString); + throw new RuntimeException('Could not process the report generated by PHPCpd.'); } diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index f40dbeda9..fafc7d5cb 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -146,6 +146,7 @@ protected function processReport($output) if (!\is_array($data)) { $this->builder->log($output); + throw new RuntimeException('Could not process the report generated by PHP CS Fixer.'); } diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index 36bc4ee0c..80b209b8a 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -126,6 +126,7 @@ protected function processReport($xmlString) if (false === $xml) { $this->builder->log($xmlString); + throw new RuntimeException('Could not process PHPMD report XML.'); } diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 8edd95a24..898e67140 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -166,7 +166,6 @@ protected function doExecutePlugins($plugins, $stage) { $success = true; foreach ($plugins as $step => $options) { - $plugin = $step; if (isset($options['plugin'])) { $plugin = $options['plugin']; diff --git a/src/Plugin/Util/Factory.php b/src/Plugin/Util/Factory.php index 28480b84c..e04210e0c 100644 --- a/src/Plugin/Util/Factory.php +++ b/src/Plugin/Util/Factory.php @@ -1,6 +1,6 @@ projectStore = $projectStore; } - /** - * @param int|null $environmentId - * @param string $commitId - * @param string|null $branch - * @param string|null $tag - * @param string|null $committerEmail - * @param string|null $commitMessage - * @param int $source - * @param int $userId - * @param array|null $extra - * - * @return Build - */ public function createBuild( Project $project, ?int $environmentId = null, @@ -245,10 +232,6 @@ public function createPeriodicalBuilds(Logger $logger): void } /** - * @param int $source - * - * @return Build - * * @throws Exception */ public function createDuplicateBuild(Build $originalBuild, int $source): Build @@ -286,8 +269,6 @@ public function createDuplicateBuild(Build $originalBuild, int $source): Build } /** - * @param int $projectId - * * @throws HttpException */ public function deleteOldByProject(int $projectId): void @@ -302,9 +283,6 @@ public function deleteOldByProject(int $projectId): void } } - /** - * @param int $projectId - */ public function deleteAllByProject(int $projectId): void { $this->buildStore->deleteAllByProject((int)$projectId); @@ -332,8 +310,6 @@ public function deleteAllByProject(int $projectId): void /** * Delete a given build. - * - * @return bool */ public function deleteBuild(Build $build): bool { @@ -362,10 +338,6 @@ public function addBuildToQueue(Build $build, int $buildPriority = Project::DEFA $this->addJobToQueue(BuildWorker::JOB_TYPE_BUILD, $jobData, ($buildPriority + Project::OFFSET_BETWEEN_BUILD_AND_QUEUE)); } - /** - * @param string $jobType - * @param int $queuePriority - */ public function addJobToQueue(string $jobType, array $jobData, int $queuePriority = PheanstalkInterface::DEFAULT_PRIORITY): void { $settings = $this->configuration->get('php-censor.queue', []); diff --git a/src/Service/BuildStatusService.php b/src/Service/BuildStatusService.php index 54f073532..d12a65f92 100644 --- a/src/Service/BuildStatusService.php +++ b/src/Service/BuildStatusService.php @@ -1,6 +1,6 @@ url = $url; } - /** - * @return Build - */ public function getBuild(): Build { return $this->build; } /** - * @param bool $isParent - * * @throws Exception */ protected function loadParentBuild(bool $isParent = true): void @@ -87,9 +79,6 @@ protected function loadParentBuild(bool $isParent = true): void } } - /** - * @return string - */ public function getActivity(): string { if (\in_array($this->build->getStatus(), $this->finishedStatusIds, true)) { @@ -103,17 +92,11 @@ public function getActivity(): string return 'Unknown'; } - /** - * @return string - */ public function getName(): string { return $this->project->getTitle() . ' / ' . $this->branch; } - /** - * @return bool - */ public function isFinished(): bool { if (\in_array($this->build->getStatus(), $this->finishedStatusIds, true)) { @@ -123,9 +106,6 @@ public function isFinished(): bool return false; } - /** - * @return Build|null - */ public function getFinishedBuildInfo(): ?Build { if ($this->isFinished()) { @@ -137,9 +117,6 @@ public function getFinishedBuildInfo(): ?Build return null; } - /** - * @return string - */ public function getLastBuildLabel(): string { if ($buildInfo = $this->getFinishedBuildInfo()) { @@ -149,9 +126,6 @@ public function getLastBuildLabel(): string return ''; } - /** - * @return string - */ public function getLastBuildTime(): string { $dateFormat = 'Y-m-d\\TH:i:sO'; @@ -162,9 +136,6 @@ public function getLastBuildTime(): string return ''; } - /** - * @return string - */ public function getBuildStatus(Build $build): string { switch ($build->getStatus()) { @@ -177,9 +148,6 @@ public function getBuildStatus(Build $build): string return 'Unknown'; } - /** - * @return string - */ public function getLastBuildStatus(): string { if ($build = $this->getFinishedBuildInfo()) { @@ -189,17 +157,11 @@ public function getLastBuildStatus(): string return ''; } - /** - * @return string - */ public function getBuildUrl(): string { return $this->url . 'build/view/' . $this->build->getId(); } - /** - * @return array - */ public function toArray(): array { if (!$this->build) { diff --git a/src/Service/ProjectService.php b/src/Service/ProjectService.php index c0e3ff0f2..68f322b63 100644 --- a/src/Service/ProjectService.php +++ b/src/Service/ProjectService.php @@ -1,6 +1,6 @@ tableName . '}} WHERE {{build_id}} = :build'; @@ -218,19 +190,13 @@ public function getKnownPlugins(int $buildId, ?int $severity = null, ?string $is $map = function ($item) { return $item['plugin']; }; + return \array_map($map, $res); } else { return []; } } - /** - * @param int $buildId - * @param string|null $plugin - * @param string|null $isNew - * - * @return array - */ public function getKnownSeverities(int $buildId, ?string $plugin = null, ?string $isNew = null): array { $query = 'SELECT DISTINCT {{severity}} FROM {{' . $this->tableName . '}} WHERE {{build_id}} = :build'; @@ -267,10 +233,6 @@ public function getKnownSeverities(int $buildId, ?string $plugin = null, ?string /** * Check if a build error is new. * - * @param int $projectId - * @param string $hash - * - * @return bool * @throws Exception */ public function getIsNewError(int $projectId, string $hash): bool @@ -296,9 +258,6 @@ public function getIsNewError(int $projectId, string $hash): bool } /** - * @param int $buildId - * - * @return array * * @throws Exception */ diff --git a/src/Store/BuildErrorWriter.php b/src/Store/BuildErrorWriter.php index 5c481e1a3..b47bec3cd 100644 --- a/src/Store/BuildErrorWriter.php +++ b/src/Store/BuildErrorWriter.php @@ -1,6 +1,6 @@ flush(); } - /** - * Write error - * - * @param string $plugin - * @param string $message - * @param int $severity - * @param string|null $file - * @param int|null $lineStart - * @param int|null $lineEnd - * @param DateTime|null $createdDate - */ public function write( string $plugin, string $message, @@ -109,9 +89,6 @@ public function write( } } - /** - * Flush buffer - */ public function flush(): void { if (empty($this->errors)) { diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 9783b25d9..a0d73d9dc 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -1,6 +1,6 @@ tableName . '}} ORDER BY {{id}} DESC LIMIT :limit OFFSET :offset'; @@ -172,11 +144,6 @@ public function getBuilds(int $limit = 5, int $offset = 0): array } /** - * @param int $projectId - * @param string $branch - * - * @return Build|null - * * @throws Exception */ public function getLatestBuildByProjectAndBranch(int $projectId, string $branch): ?Build @@ -197,11 +164,6 @@ public function getLatestBuildByProjectAndBranch(int $projectId, string $branch) /** * Return an array of the latest builds for a given project. * - * @param int|null $projectId - * @param int $limit - * - * @return array - * * @throws Exception */ public function getLatestBuilds(?int $projectId = null, int $limit = 5): array @@ -226,6 +188,7 @@ public function getLatestBuilds(?int $projectId = null, int $limit = 5): array $map = function ($item) { return new Build($this->storeRegistry, $item); }; + return \array_map($map, $res); } else { return []; @@ -234,11 +197,6 @@ public function getLatestBuilds(?int $projectId = null, int $limit = 5): array /** * Return the latest build for a specific project, of a specific build status. - * - * @param int|null $projectId - * @param int $status - * - * @return Build|null */ public function getLastBuildByStatus(?int $projectId = null, int $status = Build::STATUS_SUCCESS): ?Build { @@ -258,11 +216,6 @@ public function getLastBuildByStatus(?int $projectId = null, int $status = Build /** * Return an array of the latest builds for all projects. - * - * @param int $limitByProject - * @param int $limitAll - * - * @return array */ public function getAllProjectsLatestBuilds(int $limitByProject = 5, int $limitAll = 10): array { @@ -348,11 +301,6 @@ public function getAllProjectsLatestBuilds(int $limitByProject = 5, int $limitAl /** * Return an array of builds for a given project and commit ID. - * - * @param int $projectId - * @param string $commitId - * - * @return array */ public function getByProjectAndCommit(int $projectId, string $commitId): array { @@ -380,10 +328,6 @@ public function getByProjectAndCommit(int $projectId, string $commitId): array /** * Returns all registered branches for project * - * @param int $projectId - * - * @return array - * * @throws Exception */ public function getBuildBranches(int $projectId): array @@ -401,14 +345,6 @@ public function getBuildBranches(int $projectId): array /** * Return build metadata by key, project and optionally build id. - * - * @param string $key - * @param int $projectId - * @param int|null $buildId - * @param string|null $branch - * @param int $numResults - * - * @return array|null */ public function getMeta(string $key, int $projectId, ?int $buildId = null, ?string $branch = null, int $numResults = 1): ?array { @@ -477,10 +413,6 @@ public function getMeta(string $key, int $projectId, ?int $buildId = null, ?stri /** * Set a metadata value for a given project and build ID. - * - * @param int $buildId - * @param string $key - * @param string $value */ public function setMeta(int $buildId, string $key, string $value): void { @@ -510,11 +442,6 @@ public function deleteAllByProject(int $projectId): int } /** - * @param int $projectId - * @param int $keep - * - * @return array - * * @throws HttpException */ public function getOldByProject(int $projectId, int $keep = 100): array @@ -545,10 +472,6 @@ public function getOldByProject(int $projectId, int $keep = 100): array } /** - * @param int $buildId - * - * @return int - * * @throws Exception */ public function getNewErrorsCount(int $buildId): int @@ -569,10 +492,6 @@ public function getNewErrorsCount(int $buildId): int } /** - * @param int $buildId - * - * @return int - * * @throws Exception */ public function getErrorsCount(int $buildId): int @@ -593,12 +512,6 @@ public function getErrorsCount(int $buildId): int } /** - * @param int $buildId - * @param int $projectId - * @param string $branch - * - * @return array - * * @throws Exception */ public function getBuildErrorsTrend(int $buildId, int $projectId, string $branch): array diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 4843ef6e7..845cff7e5 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -1,6 +1,6 @@ Date: Sun, 9 Jan 2022 22:50:34 +0700 Subject: [PATCH 037/212] Fixed tests. --- tests/src/Command/CreateAdminCommandTest.php | 2 +- tests/src/Command/CreateBuildCommandTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index 55b1c6d20..497f4c47d 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -48,7 +48,7 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\StoreRegistry') ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $this->logger = $this->getMockBuilder('Monolog\Logger')->getMock(); $userStoreMock = $this ->getMockBuilder('PHPCensor\Store\UserStore') ->setConstructorArgs([$this->databaseManager, $storeRegistry]) diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 4d822bdf2..cba30a166 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -44,7 +44,7 @@ protected function setUp(): void ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $this->logger = $this->getMockBuilder('Monolog\Logger')->getMock(); $projectMock = $this ->getMockBuilder('PHPCensor\Model\Project') ->setConstructorArgs([$storeRegistry]) From dda69bb9bcf7be3a8f43694c2dd4d873e35f3654 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 9 Jan 2022 23:03:43 +0700 Subject: [PATCH 038/212] Fixed tests +. --- tests/src/Command/CreateAdminCommandTest.php | 8 +++++--- tests/src/Command/CreateBuildCommandTest.php | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index 497f4c47d..c7ecc4fe6 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -2,12 +2,12 @@ namespace Tests\PHPCensor\Command; +use Monolog\Logger; use PHPCensor\Command\CreateAdminCommand; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use Psr\Log\LoggerInterface; use Symfony\Component\Console\Application; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Tester\CommandTester; @@ -33,7 +33,7 @@ class CreateAdminCommandTest extends TestCase protected DatabaseManager $databaseManager; - protected LoggerInterface $logger; + protected Logger $logger; protected function setUp(): void { @@ -48,7 +48,9 @@ protected function setUp(): void ->getMockBuilder('PHPCensor\StoreRegistry') ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Monolog\Logger')->getMock(); + $this->logger = $this->getMockBuilder('Monolog\Logger') + ->setConstructorArgs(['logger']) + ->getMock(); $userStoreMock = $this ->getMockBuilder('PHPCensor\Store\UserStore') ->setConstructorArgs([$this->databaseManager, $storeRegistry]) diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index cba30a166..0e0b6fb37 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -2,13 +2,13 @@ namespace Tests\PHPCensor\Command; +use Monolog\Logger; use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Command\CreateBuildCommand; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use Psr\Log\LoggerInterface; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; @@ -28,7 +28,7 @@ class CreateBuildCommandTest extends TestCase protected DatabaseManager $databaseManager; - protected LoggerInterface $logger; + protected Logger $logger; protected function setUp(): void { @@ -44,8 +44,10 @@ protected function setUp(): void ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Monolog\Logger')->getMock(); - $projectMock = $this + $this->logger = $this->getMockBuilder('Monolog\Logger') + ->setConstructorArgs(['logger']) + ->getMock(); + $projectMock = $this ->getMockBuilder('PHPCensor\Model\Project') ->setConstructorArgs([$storeRegistry]) ->getMock(); From 0c8cad315757d012af0e7aa0ad6562b6998ebdda Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 24 Jan 2022 22:41:04 +0700 Subject: [PATCH 039/212] Added some features from common package. --- tests/src/Command/CreateBuildCommandTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 0e0b6fb37..0142d7c18 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -5,6 +5,7 @@ use Monolog\Logger; use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Command\CreateBuildCommand; +use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPUnit\Framework\MockObject\MockObject; @@ -99,7 +100,7 @@ public function testExecute() public function testExecuteWithUnknownProjectId() { - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); + self::expectException(InvalidArgumentException::class); $commandTester = $this->getCommandTester(); $commandTester->execute(['projectId' => 2]); From 8e9eac099aced13538c81f960580a7fd411b0032 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 11 Dec 2021 14:37:32 +0700 Subject: [PATCH 040/212] Code style fixes. --- src/Application.php | 8 ++++++-- src/Builder.php | 8 ++++++-- src/Command/WorkerCommand.php | 4 ++-- src/Console/Application.php | 2 +- src/Controller/BuildController.php | 2 -- src/Model/Base/Build.php | 1 - src/Model/Build.php | 6 +----- src/Model/Project.php | 7 +++++-- src/Plugin/Env.php | 4 +++- src/Service/BuildService.php | 2 +- src/Store/BuildErrorStore.php | 1 - src/Store/UserStore.php | 4 ---- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/Application.php b/src/Application.php index 9a413d26b..375c8a426 100644 --- a/src/Application.php +++ b/src/Application.php @@ -118,12 +118,16 @@ protected function handleRequestInner(): Response } if (!$this->controllerExists($this->route)) { - throw new NotFoundException('Controller ' . $this->toPhpName($this->route['controller']) . ' does not exist!'); + throw new NotFoundException( + 'Controller ' . $this->toPhpName($this->route['controller']) . ' does not exist!' + ); } $action = lcfirst($this->toPhpName($this->route['action'])); if (!$this->getController()->hasAction($action)) { - throw new NotFoundException('Controller ' . $this->toPhpName($this->route['controller']) . ' does not have action ' . $action . '!'); + throw new NotFoundException( + 'Controller ' . $this->toPhpName($this->route['controller']) . ' does not have action ' . $action . '!' + ); } return $this->getController()->handleAction($action, $this->route['args']); diff --git a/src/Builder.php b/src/Builder.php index 872481133..a385f70a5 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -319,8 +319,12 @@ public function logExecOutput(bool $enableLog = true): void * * @throws Exception when no binary has been found. */ - public function findBinary($binary, string $priorityPath = 'local', string $binaryPath = '', array $binaryName = []): string - { + public function findBinary( + $binary, + string $priorityPath = 'local', + string $binaryPath = '', + array $binaryName = [] + ): string { return $this->commandExecutor->findBinary($binary, $priorityPath, $binaryPath, $binaryName); } diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 28e6ad590..ca31433c4 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -27,8 +27,8 @@ */ class WorkerCommand extends Command { - public const MIN_QUEUE_PRIORITY = 24; - public const MAX_QUEUE_PRIORITY = 2025; + private const MIN_QUEUE_PRIORITY = 24; + private const MAX_QUEUE_PRIORITY = 2025; protected BuildService $buildService; diff --git a/src/Console/Application.php b/src/Console/Application.php index 49d57f26e..40908f5eb 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -41,7 +41,7 @@ */ class Application extends BaseApplication { - public const LOGO = <<<'LOGO' + private const LOGO = <<<'LOGO' ____ __ ______ ______ / __ \/ / / / __ \ / ____/__ ____ _________ _____ / /_/ / /_/ / /_/ / / / / _ \/ __ \/ ___/ __ \/ ___/ diff --git a/src/Controller/BuildController.php b/src/Controller/BuildController.php index 245d70f37..a55b6ea1d 100644 --- a/src/Controller/BuildController.php +++ b/src/Controller/BuildController.php @@ -355,8 +355,6 @@ protected function cleanLog(string $log): string /** * Formats a list of builds into rows suitable for the dropdowns in the header bar. - * - * */ protected function formatBuilds(array $builds): array { diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 827cfde49..c906f73fe 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -454,7 +454,6 @@ public function getExtra($key = null) /** * @return bool - * */ public function setExtra(array $value) { diff --git a/src/Model/Build.php b/src/Model/Build.php index e7e8c1bed..28947b249 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -238,13 +238,9 @@ public function handleConfigBeforeClone(Builder $builder) } /** - * @param string $buildPath - * - * @return bool - * * @throws Exception */ - protected function handleConfig(Builder $builder, $buildPath) + protected function handleConfig(Builder $builder, string $buildPath): bool { $yamlParser = new YamlParser(); $overwriteBuildConfig = $this->getProject()->getOverwriteBuildConfig(); diff --git a/src/Model/Project.php b/src/Model/Project.php index 666edda10..e2eef3db8 100644 --- a/src/Model/Project.php +++ b/src/Model/Project.php @@ -212,7 +212,10 @@ public function setEnvironments($value) if ($key !== false) { // already exist unset($environmentsNames[$key]); - $environment->setBranches(!empty($environmentsConfig[$environment->getName()]) ? $environmentsConfig[$environment->getName()] : []); + $branches = !empty($environmentsConfig[$environment->getName()]) + ? $environmentsConfig[$environment->getName()] + : []; + $environment->setBranches($branches); $store->save($environment); } else { // remove @@ -235,7 +238,7 @@ public function setEnvironments($value) /** * @param string $branch * - * @return string[] + * @return int[] */ public function getEnvironmentsNamesByBranch($branch) { diff --git a/src/Plugin/Env.php b/src/Plugin/Env.php index f38f8e4fe..8f65eba57 100644 --- a/src/Plugin/Env.php +++ b/src/Plugin/Env.php @@ -32,7 +32,9 @@ public function execute() foreach ($this->options as $key => $value) { if (\is_numeric($key)) { // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar" - $envVar = \is_array($value) ? \key($value) . '=' . \current($value) : $value; + $envVar = \is_array($value) + ? (\key($value) . '=' . \current($value)) + : $value; } else { // This allows the standard syntax: "FOO: bar" $envVar = "$key=$value"; diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 441e25df5..a4b1cbdf0 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -65,7 +65,7 @@ public function createBuild( ?string $committerEmail = null, ?string $commitMessage = null, int $source = Build::SOURCE_UNKNOWN, - int $userId = null, + ?int $userId = null, ?array $extra = null ): Build { $build = new Build($this->storeRegistry); diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index aac2f5c29..b48857c56 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -258,7 +258,6 @@ public function getIsNewError(int $projectId, string $hash): bool } /** - * * @throws Exception */ public function getErrorAmountPerPluginForBuild(int $buildId): array diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index 1173f4b4b..ec8541307 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -85,8 +85,6 @@ public function getByEmail(string $email): ?User * Get a single User by Email or Name. * * @throws HttpException - * - * @return User */ public function getByEmailOrName(string $emailOrName): ?User { @@ -111,8 +109,6 @@ public function getByEmailOrName(string $emailOrName): ?User * Get a single User by RememberKey. * * @throws HttpException - * - * @return User */ public function getByRememberKey(string $rememberKey): ?User { From 5032c3d76c5596a0cc60b853a2a34fd59164ae67 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 7 Feb 2022 22:33:29 +0700 Subject: [PATCH 041/212] Added Github Actions CI. --- .github/workflows/ci.yaml | 50 + README.md | 17 +- codecov.yml | 15 + composer.json | 28 +- composer.lock | 2266 ++++++++++++++++++++++--------------- 5 files changed, 1465 insertions(+), 911 deletions(-) create mode 100644 .github/workflows/ci.yaml create mode 100644 codecov.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..9e860a5be --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,50 @@ +name: Actions CI + +on: ['push', 'pull_request'] + +jobs: + testsuite: + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + php-version: ['7.4', '8.0', '8.1'] + + steps: + - uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + ini-values: memory_limit=512M, xdebug.mode=off + coverage: pcov + + - name: Get composer cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Get date part for cache key + id: key-date + run: echo "::set-output name=date::$(date +'%Y-%m')" + + - name: Cache composer dependencies + uses: actions/cache@v1 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }} + + - name: Composer install + run: composer update --no-interaction --prefer-dist --no-progress + + - name: Run tests + run: | + if [[ ${{ matrix.php-version }} == '7.4' ]]; then + export CODECOVERAGE=1 && vendor/bin/phpunit --verbose --coverage-clover=coverage.xml + else + vendor/bin/phpunit + fi + + - name: Submit code coverage + if: matrix.php-version == '7.4' + uses: codecov/codecov-action@v1 diff --git a/README.md b/README.md index 8757373e9..bf9fdc5f2 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,15 @@ -[![PHP Censor](http://ci.php-censor.info/build-status/image/2?branch=master&label=PHPCensor&style=flat-square)](http://ci.php-censor.info/build-status/view/2?branch=master) -[![Latest Version](https://img.shields.io/packagist/v/php-censor/php-censor.svg?label=Version&style=flat-square)](https://packagist.org/packages/php-censor/php-censor) -[![Total downloads](https://img.shields.io/packagist/dt/php-censor/php-censor.svg?label=Downloads&style=flat-square)](https://packagist.org/packages/php-censor/php-censor) -[![License](https://img.shields.io/packagist/l/php-censor/php-censor.svg?label=License&style=flat-square)](https://packagist.org/packages/php-censor/php-censor) - - +[![Minimum PHP version: 7.4.0](https://img.shields.io/badge/php-7.4.0%2B-blue.svg?label=PHP)](https://packagist.org/packages/php-censor/php-censor) +[![Actions](https://github.com/php-censor/php-censor/actions/workflows/ci.yaml/badge.svg)](https://github.com/php-censor/php-censor/actions) +[![PHP Censor](http://ci.php-censor.info/build-status/image/2?branch=master&label=PHP%20Censor)](http://ci.php-censor.info/build-status/view/2?branch=master) +[![Codecov](https://codecov.io/gh/php-censor/php-censor/branch/master/graph/badge.svg)](https://codecov.io/gh/php-censor/php-censor) +[![Latest Version](https://img.shields.io/packagist/v/php-censor/php-censor.svg?label=Version)](https://packagist.org/packages/php-censor/php-censor) +[![Total downloads](https://img.shields.io/packagist/dt/php-censor/php-censor.svg?label=Downloads)](https://packagist.org/packages/php-censor/php-censor) +[![License](https://img.shields.io/packagist/l/php-censor/php-censor.svg?label=License)](https://packagist.org/packages/php-censor/php-censor) +

          PHP Censor

          - - + **PHP Censor** is an open source, self-hosted, continuous integration server for PHP projects ([PHPCI](https://www.phptesting.org) fork). [Official twitter @php_censor](https://twitter.com/php_censor). diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..d7543c1ac --- /dev/null +++ b/codecov.yml @@ -0,0 +1,15 @@ +coverage: + round: nearest + precision: 0 + +comment: false + +ignore: + - "app" + - "docs" + - "public" + - "runtime" + - "tests" + - "vendor" + - "src/Migrations" + - "src/Languages" diff --git a/composer.json b/composer.json index 2f0c71c16..9cfdb7740 100644 --- a/composer.json +++ b/composer.json @@ -55,20 +55,20 @@ "ext-curl": "*", "ext-bcmath": "*", - "php-censor/common": "^1.0", + "php-censor/common": "~0.6.0", "swiftmailer/swiftmailer": "^6.2", - "symfony/yaml": "^4.4", - "symfony/console": "^4.4", - "symfony/finder": "^4.4", - "symfony/dom-crawler": "^4.4", - "symfony/css-selector": "^4.4", - "symfony/browser-kit": "^4.4", - "symfony/process": "^4.4", - "symfony/filesystem": "^4.4", - "symfony/dependency-injection": "^4.4", - "symfony/event-dispatcher": "^4.4", - "symfony/cache": "^4.4", + "symfony/yaml": "^5.4", + "symfony/console": "^5.4", + "symfony/finder": "^5.4", + "symfony/dom-crawler": "^5.4", + "symfony/css-selector": "^5.4", + "symfony/browser-kit": "^5.4", + "symfony/process": "^5.4", + "symfony/filesystem": "^5.4", + "symfony/dependency-injection": "^5.4", + "symfony/event-dispatcher": "^5.4", + "symfony/cache": "^5.4", "psr/log": "^1.1", "monolog/monolog": "^2.2", "pimple/pimple": "^3.3", @@ -82,10 +82,10 @@ "maknz/slack": "^1.7", "hipchat/hipchat-php": "^1.4", - "php-censor/flowdock-client": "^1.0" + "php-censor/flowdock-client": "^2.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^9.5", "phpspec/prophecy-phpunit": "^2.0", "squizlabs/php_codesniffer": "^3.5", "sebastian/phpcpd": "^6.0", diff --git a/composer.lock b/composer.lock index ec39bd0b0..078604391 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e7a2957b929ed6f558fa4a7af5a19fcd", + "content-hash": "4b6e8b7845329582d1699835d837ba6e", "packages": [ { "name": "cakephp/core", - "version": "4.2.6", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "c0165c3a64d11f4f48ee61aaffd4a93c4b467927" + "reference": "58f3af964f3e33769153d743a204f6e97f23c157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/c0165c3a64d11f4f48ee61aaffd4a93c4b467927", - "reference": "c0165c3a64d11f4f48ee61aaffd4a93c4b467927", + "url": "https://api.github.com/repos/cakephp/core/zipball/58f3af964f3e33769153d743a204f6e97f23c157", + "reference": "58f3af964f3e33769153d743a204f6e97f23c157", "shasum": "" }, "require": { @@ -31,12 +31,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Cake\\Core\\": "." - }, "files": [ "functions.php" - ] + ], + "psr-4": { + "Cake\\Core\\": "." + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -61,20 +61,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2021-03-30T17:17:30+00:00" + "time": "2022-01-27T02:05:53+00:00" }, { "name": "cakephp/database", - "version": "4.2.6", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "e029c0e5cbea35b2cd4c742f9d16241588594cd8" + "reference": "38db495a75abea596891f71f97b18a65d879c222" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/e029c0e5cbea35b2cd4c742f9d16241588594cd8", - "reference": "e029c0e5cbea35b2cd4c742f9d16241588594cd8", + "url": "https://api.github.com/repos/cakephp/database/zipball/38db495a75abea596891f71f97b18a65d879c222", + "reference": "38db495a75abea596891f71f97b18a65d879c222", "shasum": "" }, "require": { @@ -116,27 +116,27 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2021-04-07T13:24:04+00:00" + "time": "2022-01-31T07:07:25+00:00" }, { "name": "cakephp/datasource", - "version": "4.2.6", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "2e9805d1c5c78be6916db4ccc45e49f3ff5e5407" + "reference": "c9b4f7d44704e862b5dbae47f27895b5ed0ffd3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/2e9805d1c5c78be6916db4ccc45e49f3ff5e5407", - "reference": "2e9805d1c5c78be6916db4ccc45e49f3ff5e5407", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/c9b4f7d44704e862b5dbae47f27895b5ed0ffd3d", + "reference": "c9b4f7d44704e862b5dbae47f27895b5ed0ffd3d", "shasum": "" }, "require": { "cakephp/core": "^4.0", "php": ">=7.2.0", - "psr/log": "^1.1", - "psr/simple-cache": "^1.0" + "psr/log": "^1.0 || ^2.0", + "psr/simple-cache": "^1.0 || ^2.0" }, "suggest": { "cakephp/cache": "If you decide to use Query caching.", @@ -174,20 +174,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2021-04-07T13:24:04+00:00" + "time": "2022-01-26T12:14:58+00:00" }, { "name": "cakephp/utility", - "version": "4.2.6", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "4259ae4154e639557af751ae719d58253a79282a" + "reference": "3d352060ca3e49c81c3fd2bdb092ee345d8f4e38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/4259ae4154e639557af751ae719d58253a79282a", - "reference": "4259ae4154e639557af751ae719d58253a79282a", + "url": "https://api.github.com/repos/cakephp/utility/zipball/3d352060ca3e49c81c3fd2bdb092ee345d8f4e38", + "reference": "3d352060ca3e49c81c3fd2bdb092ee345d8f4e38", "shasum": "" }, "require": { @@ -200,12 +200,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Cake\\Utility\\": "." - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Cake\\Utility\\": "." + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -233,36 +233,32 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2021-03-29T16:08:09+00:00" + "time": "2022-01-28T18:02:00+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -297,7 +293,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "source": "https://github.com/doctrine/lexer/tree/1.2.2" }, "funding": [ { @@ -313,20 +309,20 @@ "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2022-01-12T08:27:12+00:00" }, { "name": "egulias/email-validator", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307" + "reference": "ee0db30118f661fb166bcffbf5d82032df484697" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c81f18a3efb941d8c4d2e025f6183b5c6d697307", - "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697", + "reference": "ee0db30118f661fb166bcffbf5d82032df484697", "shasum": "" }, "require": { @@ -373,7 +369,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.1.1" + "source": "https://github.com/egulias/EmailValidator/tree/3.1.2" }, "funding": [ { @@ -381,7 +377,7 @@ "type": "github" } ], - "time": "2021-04-01T18:37:14+00:00" + "time": "2021-10-11T09:18:27+00:00" }, { "name": "guzzlehttp/guzzle", @@ -456,16 +452,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -477,7 +473,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -493,10 +489,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -505,22 +516,36 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -545,25 +570,46 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -580,9 +626,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/1.8.3" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "hipchat/hipchat-php", @@ -734,24 +794,24 @@ }, { "name": "monolog/monolog", - "version": "2.2.0", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084" + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084", - "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", "shasum": "" }, "require": { "php": ">=7.2", - "psr/log": "^1.0.1" + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0" + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" }, "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", @@ -759,14 +819,14 @@ "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", "mongodb/mongodb": "^1.8", - "php-amqplib/php-amqplib": "~2.4", + "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.6.1", - "phpstan/phpstan": "^0.12.59", + "phpstan/phpstan": "^0.12.91", "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90 <7.0.1", + "ruflin/elastica": ">=0.90@dev", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { @@ -774,8 +834,11 @@ "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", "ext-mbstring": "Allow to work properly with unicode symbols", "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", @@ -814,7 +877,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.2.0" + "source": "https://github.com/Seldaek/monolog/tree/2.3.5" }, "funding": [ { @@ -826,20 +889,20 @@ "type": "tidelift" } ], - "time": "2020-12-14T13:15:25+00:00" + "time": "2021-10-01T21:08:31+00:00" }, { "name": "pda/pheanstalk", - "version": "v4.0.3", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/pheanstalk/pheanstalk.git", - "reference": "6165573aad525d39b3ac8ae916214cb483a61263" + "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/6165573aad525d39b3ac8ae916214cb483a61263", - "reference": "6165573aad525d39b3ac8ae916214cb483a61263", + "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/1a43eb97a53144a2e692bce2ea2be721cc9913a4", + "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4", "shasum": "" }, "require": { @@ -879,34 +942,39 @@ ], "support": { "issues": "https://github.com/pheanstalk/pheanstalk/issues", - "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.3" + "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.4" }, - "time": "2020-09-22T07:17:48+00:00" + "time": "2021-11-19T15:00:20+00:00" }, { "name": "php-censor/common", - "version": "1.0.0", + "version": "0.6.0", "source": { "type": "git", "url": "https://github.com/php-censor/common.git", - "reference": "a8ba554ee7b40b6820e7d338b6c1e90a12c3af12" + "reference": "ddfe8ba729f5661af7c0d302ae5890054d03e368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/common/zipball/a8ba554ee7b40b6820e7d338b6c1e90a12c3af12", - "reference": "a8ba554ee7b40b6820e7d338b6c1e90a12c3af12", + "url": "https://api.github.com/repos/php-censor/common/zipball/ddfe8ba729f5661af7c0d302ae5890054d03e368", + "reference": "ddfe8ba729f5661af7c0d302ae5890054d03e368", "shasum": "" }, "require": { "ext-json": "*", "php": ">=7.4.0", - "psr/container": "^1.0" + "psr/container": "^1.1", + "symfony/mailer": "^5.4" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.16", - "infection/infection": "^0.12", - "phpunit/phpunit": "^7.5", - "vimeo/psalm": "^3.16" + "friendsofphp/php-cs-fixer": "^3.4", + "infection/infection": "^0.25", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phploc/phploc": "^7.0", + "phpmd/phpmd": "^1.5", + "phpunit/phpunit": "^9.5", + "sebastian/phpcpd": "^6.0", + "vimeo/psalm": "^4.16" }, "type": "library", "extra": { @@ -927,7 +995,7 @@ { "name": "Dmitry Khomutov", "email": "poisoncorpsee@gmail.com", - "homepage": "http://corpsee.com", + "homepage": "https://corpsee.com", "role": "PHP Censor developer" } ], @@ -947,32 +1015,37 @@ "issues": "https://github.com/php-censor/common/issues", "source": "https://github.com/php-censor/common" }, - "time": "2021-05-18T15:43:39+00:00" + "time": "2022-02-07T15:41:38+00:00" }, { "name": "php-censor/flowdock-client", - "version": "1.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-censor/flowdock-client.git", - "reference": "5be924e20b96a573386d3704e938d2b510800b3e" + "reference": "46b4ae2dbceb25389b7f84e0c56bbb5c165ec49d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/flowdock-client/zipball/5be924e20b96a573386d3704e938d2b510800b3e", - "reference": "5be924e20b96a573386d3704e938d2b510800b3e", + "url": "https://api.github.com/repos/php-censor/flowdock-client/zipball/46b4ae2dbceb25389b7f84e0c56bbb5c165ec49d", + "reference": "46b4ae2dbceb25389b7f84e0c56bbb5c165ec49d", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/guzzle": "~6.0", - "php": ">=5.6.0", - "symfony/console": "~2.5|~3.0|~4.0" + "guzzlehttp/guzzle": "~6.5", + "php": ">=7.4.0", + "symfony/console": "^5.4" }, "require-dev": { - "phpunit/phpunit": "~5.7.0" + "phpunit/phpunit": "^9.5" }, "type": "library", + "extra": { + "platform": { + "php": "7.4.*" + } + }, "autoload": { "psr-4": { "FlowdockClient\\": "src" @@ -1003,30 +1076,30 @@ ], "support": { "issues": "https://github.com/php-censor/flowdock-client/issues", - "source": "https://github.com/php-censor/flowdock-client/tree/1.0.0" + "source": "https://github.com/php-censor/flowdock-client/tree/2.0.0" }, - "time": "2018-12-16T09:47:50+00:00" + "time": "2022-02-07T02:02:55+00:00" }, { "name": "pimple/pimple", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "86406047271859ffc13424a048541f4531f53601" + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/86406047271859ffc13424a048541f4531f53601", - "reference": "86406047271859ffc13424a048541f4531f53601", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1 || ^2.0" }, "require-dev": { - "symfony/phpunit-bridge": "^5.0" + "symfony/phpunit-bridge": "^5.4@dev" }, "type": "library", "extra": { @@ -1056,9 +1129,9 @@ "dependency injection" ], "support": { - "source": "https://github.com/silexphp/Pimple/tree/v3.4.0" + "source": "https://github.com/silexphp/Pimple/tree/v3.5.0" }, - "time": "2021-03-06T08:28:00+00:00" + "time": "2021-10-28T11:13:42+00:00" }, { "name": "psr/cache", @@ -1111,20 +1184,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -1153,9 +1226,59 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2019-01-08T18:20:26+00:00" }, { "name": "psr/http-message", @@ -1357,27 +1480,27 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.7", + "version": "0.12.10", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2" + "reference": "ad056cff354fc67fedf9bf96c441c2b428afad0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2", - "reference": "bdd8f337fcdf24c20d0b708664a85ca9b8d5dbe2", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/ad056cff354fc67fedf9bf96c441c2b428afad0c", + "reference": "ad056cff354fc67fedf9bf96c441c2b428afad0c", "shasum": "" }, "require": { "cakephp/database": "^4.0", "php": ">=7.2", "psr/container": "^1.0 || ^2.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0|^5.0" + "symfony/config": "^3.4|^4.0|^5.0|^6.0", + "symfony/console": "^3.4|^4.0|^5.0|^6.0" }, "require-dev": { - "cakephp/cakephp-codesniffer": "^3.0", + "cakephp/cakephp-codesniffer": "^4.0", "ext-json": "*", "ext-pdo": "*", "phpunit/phpunit": "^8.5|^9.3", @@ -1437,9 +1560,75 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.7" + "source": "https://github.com/cakephp/phinx/tree/0.12.10" + }, + "time": "2022-01-21T19:53:14+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" }, - "time": "2021-04-16T14:27:37+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -1497,16 +1686,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933" + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c", + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c", "shasum": "" }, "require": { @@ -1518,7 +1707,7 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "symfony/phpunit-bridge": "^4.4|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.4" }, "suggest": { "ext-intl": "Needed to support internationalized email addresses" @@ -1556,7 +1745,7 @@ ], "support": { "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0" }, "funding": [ { @@ -1568,31 +1757,33 @@ "type": "tidelift" } ], - "time": "2021-03-09T12:30:35+00:00" + "abandoned": "symfony/mailer", + "time": "2021-10-18T15:26:12+00:00" }, { "name": "symfony/browser-kit", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "7e6a92d5d97d826830924bd8cd22daa452c9e467" + "reference": "18e73179c6a33d520de1b644941eba108dd811ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/7e6a92d5d97d826830924bd8cd22daa452c9e467", - "reference": "7e6a92d5d97d826830924bd8cd22daa452c9e467", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/18e73179c6a33d520de1b644941eba108dd811ad", + "reference": "18e73179c6a33d520de1b644941eba108dd811ad", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/dom-crawler": "^3.4|^4.0|^5.0" + "php": ">=7.2.5", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/http-client": "^4.3|^5.0", - "symfony/mime": "^4.3|^5.0", - "symfony/process": "^3.4|^4.0|^5.0" + "symfony/css-selector": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/process": "" @@ -1623,7 +1814,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v4.4.24" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.3" }, "funding": [ { @@ -1639,52 +1830,56 @@ "type": "tidelift" } ], - "time": "2021-05-16T09:52:47+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/cache", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee" + "reference": "4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/9084b7312c3de1e6d621d60e00c5d42a4b77cfee", - "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee", + "url": "https://api.github.com/repos/symfony/cache/zipball/4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825", + "reference": "4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "psr/cache": "^1.0|^2.0", - "psr/log": "~1.0", + "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^1.1.7|^2", - "symfony/service-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.2|^5.0" + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "conflict": { - "doctrine/dbal": "<2.6", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4|>=5.0", + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<4.4", + "symfony/http-kernel": "<4.4", "symfony/var-dumper": "<4.4" }, "provide": { "psr/cache-implementation": "1.0|2.0", - "psr/simple-cache-implementation": "1.0", + "psr/simple-cache-implementation": "1.0|2.0", "symfony/cache-implementation": "1.0|2.0" }, "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.13.1|^3.0", "predis/predis": "^1.1", - "psr/simple-cache": "^1.0", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.1|^5.0", - "symfony/filesystem": "^4.4|^5.0", - "symfony/http-kernel": "^4.4", - "symfony/var-dumper": "^4.4|^5.0" + "psr/simple-cache": "^1.0|^2.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -1716,7 +1911,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.24" + "source": "https://github.com/symfony/cache/tree/v5.4.3" }, "funding": [ { @@ -1732,20 +1927,20 @@ "type": "tidelift" } ], - "time": "2021-05-16T21:41:25+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/cache-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "c0446463729b89dd4fa62e9aeecc80287323615d" + "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/c0446463729b89dd4fa62e9aeecc80287323615d", - "reference": "c0446463729b89dd4fa62e9aeecc80287323615d", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ac2e168102a2e06a2624f0379bde94cd5854ced2", + "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2", "shasum": "" }, "require": { @@ -1758,7 +1953,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1795,7 +1990,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.0" }, "funding": [ { @@ -1811,36 +2006,39 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-08-17T14:20:01+00:00" }, { "name": "symfony/config", - "version": "v4.4.23", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928" + "reference": "d65e1bd990c740e31feb07d2b0927b8d4df9956f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/be9e601f17fc684ddfd6c675fdfcd04bb51fa928", - "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928", + "url": "https://api.github.com/repos/symfony/config/zipball/d65e1bd990c740e31feb07d2b0927b8d4df9956f", + "reference": "d65e1bd990c740e31feb07d2b0927b8d4df9956f", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/filesystem": "^3.4|^4.0|^5.0", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22" }, "conflict": { - "symfony/finder": "<3.4" + "symfony/finder": "<4.4" }, "require-dev": { - "symfony/event-dispatcher": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/messenger": "^4.1|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/yaml": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -1871,7 +2069,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.23" + "source": "https://github.com/symfony/config/tree/v5.4.3" }, "funding": [ { @@ -1887,46 +2085,50 @@ "type": "tidelift" } ], - "time": "2021-05-07T13:37:51+00:00" + "time": "2022-01-03T09:50:52+00:00" }, { "name": "symfony/console", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d" + "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d", - "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d", + "url": "https://api.github.com/repos/symfony/console/zipball/a2a86ec353d825c75856c6fd14fac416a7bdb6b8", + "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2" + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", "symfony/lock": "<4.4", - "symfony/process": "<3.3" + "symfony/process": "<4.4" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1959,8 +2161,14 @@ ], "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command line", + "console", + "terminal" + ], "support": { - "source": "https://github.com/symfony/console/tree/v4.4.24" + "source": "https://github.com/symfony/console/tree/v5.4.3" }, "funding": [ { @@ -1976,24 +2184,25 @@ "type": "tidelift" } ], - "time": "2021-05-13T06:28:07+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/css-selector", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "947cacaf1b3a2af6f13a435392873d5ddaba5f70" + "reference": "b0a190285cd95cb019237851205b8140ef6e368e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70", - "reference": "947cacaf1b3a2af6f13a435392873d5ddaba5f70", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e", + "reference": "b0a190285cd95cb019237851205b8140ef6e368e", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -2025,7 +2234,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v4.4.24" + "source": "https://github.com/symfony/css-selector/tree/v5.4.3" }, "funding": [ { @@ -2041,41 +2250,45 @@ "type": "tidelift" } ], - "time": "2021-05-16T09:52:47+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8422396fb0b477ecbbe130907f90a0809b49c835" + "reference": "974580fd67f14d65b045c11b09eb149cd4b13df5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8422396fb0b477ecbbe130907f90a0809b49c835", - "reference": "8422396fb0b477ecbbe130907f90a0809b49c835", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/974580fd67f14d65b045c11b09eb149cd4b13df5", + "reference": "974580fd67f14d65b045c11b09eb149cd4b13df5", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/container": "^1.0", + "php": ">=7.2.5", + "psr/container": "^1.1.1", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22", "symfony/service-contracts": "^1.1.6|^2" }, "conflict": { - "symfony/config": "<4.3|>=5.0", - "symfony/finder": "<3.4", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" + "ext-psr": "<1.1|>=2", + "symfony/config": "<5.3", + "symfony/finder": "<4.4", + "symfony/proxy-manager-bridge": "<4.4", + "symfony/yaml": "<4.4" }, "provide": { "psr/container-implementation": "1.0", "symfony/service-implementation": "1.0|2.0" }, "require-dev": { - "symfony/config": "^4.3", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^4.4|^5.0" + "symfony/config": "^5.3|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/config": "", @@ -2110,7 +2323,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.24" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.3" }, "funding": [ { @@ -2126,44 +2339,38 @@ "type": "tidelift" } ], - "time": "2021-05-16T09:52:47+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { - "name": "symfony/dom-crawler", - "version": "v4.4.24", + "name": "symfony/deprecation-contracts", + "version": "v2.5.0", "source": { "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "fc0bd1f215b0cd9f4efdc63bb66808f3417331bc" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc0bd1f215b0cd9f4efdc63bb66808f3417331bc", - "reference": "fc0bd1f215b0cd9f4efdc63bb66808f3417331bc", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "masterminds/html5": "<2.6" - }, - "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/css-selector": "" + "php": ">=7.1" }, "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" }, - "exclude-from-classmap": [ - "/Tests/" + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2172,18 +2379,18 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Eases DOM navigation for HTML and XML documents", + "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.24" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -2199,46 +2406,123 @@ "type": "tidelift" } ], - "time": "2021-05-16T09:52:47+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v4.4.20", + "name": "symfony/dom-crawler", + "version": "v5.4.3", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c" + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "2634381fdf27a2a0a8ac8eb404025eb656c65d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c", - "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2634381fdf27a2a0a8ac8eb404025eb656c65d0c", + "reference": "2634381fdf27a2a0a8ac8eb404025eb656c65d0c", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "symfony/dependency-injection": "<3.4" - }, - "provide": { - "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "1.1" + "masterminds/html5": "<2.6" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/error-handler": "~3.4|~4.4", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^3.4|^4.0|^5.0" + "masterminds/html5": "^2.6", + "symfony/css-selector": "^4.4|^5.0|^6.0" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "symfony/css-selector": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases DOM navigation for HTML and XML documents", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v5.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d", + "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "symfony/dependency-injection": "<4.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "autoload": { @@ -2266,7 +2550,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.20" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3" }, "funding": [ { @@ -2282,33 +2566,33 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.9", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7" + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" }, "suggest": { - "psr/event-dispatcher": "", "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2345,7 +2629,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" }, "funding": [ { @@ -2361,25 +2645,27 @@ "type": "tidelift" } ], - "time": "2020-07-06T13:19:58+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/filesystem", - "version": "v4.4.22", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a" + "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a", - "reference": "f0f06656a18304cdeacb2c4c0113a2b78a2b4c2a", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b", + "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -2407,7 +2693,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.22" + "source": "https://github.com/symfony/filesystem/tree/v5.4.3" }, "funding": [ { @@ -2423,24 +2709,26 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:24:12+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/finder", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983" + "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983", - "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983", + "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", + "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -2468,7 +2756,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.24" + "source": "https://github.com/symfony/finder/tree/v5.4.3" }, "funding": [ { @@ -2484,25 +2772,187 @@ "type": "tidelift" } ], - "time": "2021-05-16T12:27:45+00:00" + "time": "2022-01-26T16:34:36+00:00" + }, + { + "name": "symfony/mailer", + "version": "v5.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/mailer.git", + "reference": "391a2ac6bf8ab298caa7b63826edc9500412ed16" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mailer/zipball/391a2ac6bf8ab298caa7b63826edc9500412ed16", + "reference": "391a2ac6bf8ab298caa7b63826edc9500412ed16", + "shasum": "" + }, + "require": { + "egulias/email-validator": "^2.1.10|^3", + "php": ">=7.2.5", + "psr/event-dispatcher": "^1", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/mime": "^5.2.6|^6.0", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3" + }, + "conflict": { + "symfony/http-kernel": "<4.4" + }, + "require-dev": { + "symfony/http-client-contracts": "^1.1|^2|^3", + "symfony/messenger": "^4.4|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps sending emails", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/mailer/tree/v5.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/mime", + "version": "v5.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/mime.git", + "reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mime/zipball/e1503cfb5c9a225350f549d3bb99296f4abfb80f", + "reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/mailer": "<4.4" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10|^3.1", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.1|^6.0", + "symfony/property-info": "^4.4|^5.1|^6.0", + "symfony/serializer": "^5.2|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mime\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows manipulating MIME messages", + "homepage": "https://symfony.com", + "keywords": [ + "mime", + "mime-type" + ], + "support": { + "source": "https://github.com/symfony/mime/tree/v5.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, @@ -2547,7 +2997,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, "funding": [ { @@ -2563,25 +3013,28 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-iconv": "*" + }, "suggest": { "ext-iconv": "For best performance" }, @@ -2596,12 +3049,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Iconv\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2627,7 +3080,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.24.0" }, "funding": [ { @@ -2643,20 +3096,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2022-01-04T09:04:05+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", - "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", "shasum": "" }, "require": { @@ -2676,12 +3129,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2708,7 +3161,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" }, "funding": [ { @@ -2724,20 +3177,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2021-11-23T21:10:46+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -2759,12 +3212,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2795,7 +3248,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" }, "funding": [ { @@ -2811,11 +3264,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -2844,12 +3297,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -2879,7 +3332,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -2899,21 +3352,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -2959,7 +3415,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -2975,11 +3431,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -3005,12 +3461,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3035,7 +3491,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" }, "funding": [ { @@ -3055,16 +3511,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { @@ -3081,12 +3537,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3114,7 +3570,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" }, "funding": [ { @@ -3130,20 +3586,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-06-05T21:20:04+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -3160,12 +3616,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3197,7 +3653,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, "funding": [ { @@ -3213,24 +3669,104 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-09-13T13:58:33+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.24.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-09-13T13:58:11+00:00" }, { "name": "symfony/process", - "version": "v4.4.22", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b" + "reference": "553f50487389a977eb31cf6b37faae56da00f753" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b", - "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b", + "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753", + "reference": "553f50487389a977eb31cf6b37faae56da00f753", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -3258,7 +3794,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.22" + "source": "https://github.com/symfony/process/tree/v5.4.3" }, "funding": [ { @@ -3274,25 +3810,29 @@ "type": "tidelift" } ], - "time": "2021-04-07T16:22:29+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -3300,7 +3840,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3337,7 +3877,93 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-04T16:48:04+00:00" + }, + { + "name": "symfony/string", + "version": "v5.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.4.3" }, "funding": [ { @@ -3353,28 +3979,28 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.2.8", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "d26db2d2b2d7eb2c1adb8545179f8803998b8237" + "reference": "b199936b7365be36663532e547812d3abb10234a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d26db2d2b2d7eb2c1adb8545179f8803998b8237", - "reference": "d26db2d2b2d7eb2c1adb8545179f8803998b8237", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b199936b7365be36663532e547812d3abb10234a", + "reference": "b199936b7365be36663532e547812d3abb10234a", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "symfony/var-dumper": "^4.4.9|^5.0.9" + "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0" }, "type": "library", "autoload": { @@ -3410,7 +4036,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.3.0-BETA3" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.3" }, "funding": [ { @@ -3426,35 +4052,39 @@ "type": "tidelift" } ], - "time": "2021-05-07T13:42:21+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.24", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef" + "reference": "e80f87d2c9495966768310fc531b487ce64237a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", - "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e80f87d2c9495966768310fc531b487ce64237a2", + "reference": "e80f87d2c9495966768310fc531b487ce64237a2", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<3.4" + "symfony/console": "<5.3" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" + "symfony/console": "^5.3|^6.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" }, + "bin": [ + "Resources/bin/yaml-lint" + ], "type": "library", "autoload": { "psr-4": { @@ -3481,7 +4111,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.24" + "source": "https://github.com/symfony/yaml/tree/v5.4.3" }, "funding": [ { @@ -3497,25 +4127,25 @@ "type": "tidelift" } ], - "time": "2021-05-16T09:52:47+00:00" + "time": "2022-01-26T16:32:32+00:00" }, { "name": "voku/anti-xss", - "version": "4.1.32", + "version": "4.1.36", "source": { "type": "git", "url": "https://github.com/voku/anti-xss.git", - "reference": "159b49a50cf3f6cf72ee43b0dcf7c2580a0c12d1" + "reference": "0d8f17f7298a6ffa7bc30b01e44f10e8a7460322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/anti-xss/zipball/159b49a50cf3f6cf72ee43b0dcf7c2580a0c12d1", - "reference": "159b49a50cf3f6cf72ee43b0dcf7c2580a0c12d1", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/0d8f17f7298a6ffa7bc30b01e44f10e8a7460322", + "reference": "0d8f17f7298a6ffa7bc30b01e44f10e8a7460322", "shasum": "" }, "require": { "php": ">=7.0.0", - "voku/portable-utf8": "~5.4.51" + "voku/portable-utf8": "~6.0.2" }, "require-dev": { "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" @@ -3556,7 +4186,7 @@ ], "support": { "issues": "https://github.com/voku/anti-xss/issues", - "source": "https://github.com/voku/anti-xss/tree/4.1.32" + "source": "https://github.com/voku/anti-xss/tree/4.1.36" }, "funding": [ { @@ -3580,20 +4210,20 @@ "type": "tidelift" } ], - "time": "2021-03-29T14:29:34+00:00" + "time": "2022-01-27T07:19:19+00:00" }, { "name": "voku/portable-ascii", - "version": "1.5.6", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "80953678b19901e5165c56752d087fc11526017c" + "reference": "9bd89e83cecdf8c37b64909454249eaed98b2c89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c", - "reference": "80953678b19901e5165c56752d087fc11526017c", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/9bd89e83cecdf8c37b64909454249eaed98b2c89", + "reference": "9bd89e83cecdf8c37b64909454249eaed98b2c89", "shasum": "" }, "require": { @@ -3630,7 +4260,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/1.5.6" + "source": "https://github.com/voku/portable-ascii/tree/2.0.0" }, "funding": [ { @@ -3654,20 +4284,20 @@ "type": "tidelift" } ], - "time": "2020-11-12T00:07:28+00:00" + "time": "2022-01-24T18:59:03+00:00" }, { "name": "voku/portable-utf8", - "version": "5.4.51", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "578f5266725dc9880483d24ad0cfb39f8ce170f7" + "reference": "82a714b5a4973974c1113e97b11c1044a8b8cb85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/578f5266725dc9880483d24ad0cfb39f8ce170f7", - "reference": "578f5266725dc9880483d24ad0cfb39f8ce170f7", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/82a714b5a4973974c1113e97b11c1044a8b8cb85", + "reference": "82a714b5a4973974c1113e97b11c1044a8b8cb85", "shasum": "" }, "require": { @@ -3677,7 +4307,7 @@ "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php72": "~1.0", - "voku/portable-ascii": "~1.5.6" + "voku/portable-ascii": "~2.0.0" }, "require-dev": { "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" @@ -3728,54 +4358,125 @@ "utf8" ], "support": { - "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/5.4.51" + "issues": "https://github.com/voku/portable-utf8/issues", + "source": "https://github.com/voku/portable-utf8/tree/6.0.3" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-utf8", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8", + "type": "tidelift" + } + ], + "time": "2022-01-30T05:20:24+00:00" + } + ], + "packages-dev": [ + { + "name": "composer/pcre", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.1" }, "funding": [ { - "url": "https://www.paypal.me/moelleken", + "url": "https://packagist.com", "type": "custom" }, { - "url": "https://github.com/voku", + "url": "https://github.com/composer", "type": "github" }, { - "url": "https://opencollective.com/portable-utf8", - "type": "open_collective" - }, - { - "url": "https://www.patreon.com/voku", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-12-02T01:58:49+00:00" - } - ], - "packages-dev": [ + "time": "2022-01-21T20:24:37+00:00" + }, { "name": "composer/semver", - "version": "3.2.5", + "version": "3.2.9", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649", + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^1.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -3820,7 +4521,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.9" }, "funding": [ { @@ -3836,29 +4537,31 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2022-02-04T13:58:43+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", "shasum": "" }, "require": { + "composer/pcre": "^1", "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { @@ -3884,7 +4587,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.4" }, "funding": [ { @@ -3900,20 +4603,20 @@ "type": "tidelift" } ], - "time": "2021-05-05T19:37:51+00:00" + "time": "2022-01-04T17:06:45+00:00" }, { "name": "doctrine/annotations", - "version": "1.13.1", + "version": "1.13.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" + "reference": "5b668aef16090008790395c02c893b1ba13f7e08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", - "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08", "shasum": "" }, "require": { @@ -3970,9 +4673,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.1" + "source": "https://github.com/doctrine/annotations/tree/1.13.2" }, - "time": "2021-05-16T18:07:53+00:00" + "time": "2021-08-05T19:00:23+00:00" }, { "name": "doctrine/instantiator", @@ -4045,85 +4748,65 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.19.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b" + "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5b8a9d852b292c2f8a035200fa6844b1f82300b", - "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", + "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", "shasum": "" }, "require": { - "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2 || ^2.0", - "doctrine/annotations": "^1.2", + "composer/semver": "^3.2", + "composer/xdebug-handler": "^2.0", + "doctrine/annotations": "^1.12", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || ^7.0 || ^8.0", - "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", - "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", - "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" + "php": "^7.2.5 || ^8.0", + "php-cs-fixer/diff": "^2.0", + "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0", + "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0", + "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0", + "symfony/finder": "^4.4.20 || ^5.0 || ^6.0", + "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.23", + "symfony/polyfill-php81": "^1.23", + "symfony/process": "^4.4.20 || ^5.0 || ^6.0", + "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0" }, "require-dev": { - "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.4", - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.4.2", - "php-cs-fixer/accessible-object": "^1.0", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.8", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", + "phpunit/phpunit": "^8.5.21 || ^9.5", "phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/traits": "^1.9.1", - "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", - "symfony/phpunit-bridge": "^5.2.1", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + "symfony/phpunit-bridge": "^5.2.4 || ^6.0", + "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0" }, "suggest": { "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters.", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "ext-mbstring": "For handling non-UTF8 characters." }, "bin": [ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.19-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" - }, - "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationCaseFactory.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php", - "tests/Test/IntegrationCaseFactoryInterface.php", - "tests/Test/InternalIntegrationCaseFactory.php", - "tests/Test/IsIdenticalConstraint.php", - "tests/Test/TokensWithObservedTransformers.php", - "tests/TestCase.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4142,7 +4825,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0" }, "funding": [ { @@ -4150,7 +4833,7 @@ "type": "github" } ], - "time": "2021-05-03T21:43:24+00:00" + "time": "2021-12-11T16:25:08+00:00" }, { "name": "myclabs/deep-copy", @@ -4169,9 +4852,6 @@ "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" - }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", @@ -4179,12 +4859,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4212,16 +4892,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.5", + "version": "v4.13.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", - "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { @@ -4262,22 +4942,22 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "time": "2021-05-03T19:11:20+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { "name": "pdepend/pdepend", - "version": "2.9.1", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "1632f0cee84512ffd6dde71e58536b3b06528c41" + "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1632f0cee84512ffd6dde71e58536b3b06528c41", - "reference": "1632f0cee84512ffd6dde71e58536b3b06528c41", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c8c1d2af43fb8c2b5387d50e9c42a9c56de13686", + "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686", "shasum": "" }, "require": { @@ -4313,7 +4993,7 @@ "description": "Official version of pdepend to be handled with Composer", "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.9.1" + "source": "https://github.com/pdepend/pdepend/tree/2.10.2" }, "funding": [ { @@ -4321,20 +5001,20 @@ "type": "tidelift" } ], - "time": "2021-04-15T21:36:28+00:00" + "time": "2021-11-16T20:05:32+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133" + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", - "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { @@ -4379,9 +5059,9 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" + "source": "https://github.com/phar-io/manifest/tree/2.0.3" }, - "time": "2020-06-27T14:33:11+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { "name": "phar-io/version", @@ -4436,22 +5116,32 @@ }, { "name": "php-censor/phpdoc-checker", - "version": "2.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-censor/phpdoc-checker.git", - "reference": "bc46cee33a7f22f481a8cb536ea38a22df8134d5" + "reference": "1e63763c9024d6f2f38995889d8febf92f26f030" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/bc46cee33a7f22f481a8cb536ea38a22df8134d5", - "reference": "bc46cee33a7f22f481a8cb536ea38a22df8134d5", + "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/1e63763c9024d6f2f38995889d8febf92f26f030", + "reference": "1e63763c9024d6f2f38995889d8febf92f26f030", "shasum": "" }, "require": { - "nikic/php-parser": "^4.2", - "php": ">=7.1.0", - "symfony/console": "^4.3" + "ext-ctype": "*", + "ext-json": "*", + "nikic/php-parser": "^4.12", + "php": ">=7.4.0", + "symfony/console": "^4.4|^5.0" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "^1.0", + "phploc/phploc": "^2.0", + "phpmd/phpmd": "^2.10", + "phpunit/phpunit": "^7.5", + "sebastian/phpcpd": "^5.0", + "squizlabs/php_codesniffer": "^3.6" }, "bin": [ "bin/phpdoc-checker" @@ -4467,17 +5157,17 @@ "BSD-2-Clause" ], "authors": [ - { - "name": "Dan Cryer", - "email": "dan.cryer@block8.co.uk", - "homepage": "http://www.block8.co.uk", - "role": "PHP DocBlocks Checker developer" - }, { "name": "Dmitry Khomutov", "email": "poisoncorpsee@gmail.com", "homepage": "http://corpsee.com", "role": "PHPDoc Checker developer" + }, + { + "name": "Dan Cryer", + "email": "dan.cryer@block8.co.uk", + "homepage": "http://www.block8.co.uk", + "role": "PHP DocBlocks Checker developer" } ], "description": "A simple tool for checking that your PHP classes and methods use PHPDocs (PHP DocBlocks Checker fork).", @@ -4496,20 +5186,20 @@ "issues": "https://github.com/php-censor/phpdoc-checker/issues", "source": "https://github.com/php-censor/phpdoc-checker" }, - "time": "2019-06-08T03:30:44+00:00" + "time": "2021-09-09T02:30:59+00:00" }, { "name": "php-cs-fixer/diff", - "version": "v1.3.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", "shasum": "" }, "require": { @@ -4537,34 +5227,31 @@ { "name": "Kore Nordmann", "email": "mail@kore-nordmann.de" - }, - { - "name": "SpacePossum" } ], - "description": "sebastian/diff v2 backport support for PHP5.6", + "description": "sebastian/diff v3 backport support for PHP 5.6+", "homepage": "https://github.com/PHP-CS-Fixer", "keywords": [ "diff" ], "support": { "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" }, - "time": "2020-10-14T08:39:05+00:00" + "time": "2020-10-14T08:32:19+00:00" }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "772a954e5f119f6f5871d015b23eabed8cbdadfb" + "reference": "761f3806e30239b5fcd90a0a45d41dc2138de192" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/772a954e5f119f6f5871d015b23eabed8cbdadfb", - "reference": "772a954e5f119f6f5871d015b23eabed8cbdadfb", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/761f3806e30239b5fcd90a0a45d41dc2138de192", + "reference": "761f3806e30239b5fcd90a0a45d41dc2138de192", "shasum": "" }, "require": { @@ -4578,7 +5265,7 @@ "require-dev": { "nette/tester": "^1.3 || ^2.0", "php-parallel-lint/php-console-highlighter": "~0.3", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.6" }, "suggest": { "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet" @@ -4606,9 +5293,9 @@ "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.0" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.1" }, - "time": "2021-04-07T14:42:48+00:00" + "time": "2021-08-13T05:35:13+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4665,16 +5352,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -4685,7 +5372,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -4715,22 +5403,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.4.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "shasum": "" }, "require": { @@ -4738,7 +5426,8 @@ "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "*" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -4764,9 +5453,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" }, - "time": "2020-09-17T18:55:26+00:00" + "time": "2022-01-04T19:58:01+00:00" }, { "name": "phploc/phploc", @@ -4831,22 +5520,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.10.1", + "version": "2.11.1", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "bd5ef43d1dcaf7272605027c959c1c5ff3761f7a" + "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/bd5ef43d1dcaf7272605027c959c1c5ff3761f7a", - "reference": "bd5ef43d1dcaf7272605027c959c1c5ff3761f7a", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b60a2eb7e14c23f46ff8865b510ae08b75d0fd", + "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0", "ext-xml": "*", - "pdepend/pdepend": "^2.9.1", + "pdepend/pdepend": "^2.10.2", "php": ">=5.3.9" }, "require-dev": { @@ -4902,7 +5591,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.10.1" + "source": "https://github.com/phpmd/phpmd/tree/2.11.1" }, "funding": [ { @@ -4910,37 +5599,37 @@ "type": "tidelift" } ], - "time": "2021-05-11T17:16:16+00:00" + "time": "2021-12-17T11:25:43+00:00" }, { "name": "phpspec/prophecy", - "version": "1.13.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.1", + "php": "^7.2 || ~8.0, <8.2", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^6.0", + "phpspec/phpspec": "^6.0 || ^7.0", "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -4975,9 +5664,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.13.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" }, - "time": "2021-03-17T13:42:18+00:00" + "time": "2021-12-08T12:19:24+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -5033,23 +5722,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.6", + "version": "9.2.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "f6293e1b30a2354e8428e004689671b83871edde" + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde", - "reference": "f6293e1b30a2354e8428e004689671b83871edde", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687", + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.10.2", + "nikic/php-parser": "^4.13.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -5098,7 +5787,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10" }, "funding": [ { @@ -5106,20 +5795,20 @@ "type": "github" } ], - "time": "2021-03-28T07:26:59+00:00" + "time": "2021-12-05T09:12:13+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { @@ -5158,7 +5847,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -5166,7 +5855,7 @@ "type": "github" } ], - "time": "2020-09-28T05:57:25+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { "name": "phpunit/php-invoker", @@ -5351,16 +6040,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.4", + "version": "9.5.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c73c6737305e779771147af66c96ca6a7ed8a741" + "reference": "597cb647654ede35e43b137926dfdfef0fb11743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741", - "reference": "c73c6737305e779771147af66c96ca6a7ed8a741", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743", + "reference": "597cb647654ede35e43b137926dfdfef0fb11743", "shasum": "" }, "require": { @@ -5372,11 +6061,11 @@ "ext-xml": "*", "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.1", + "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-code-coverage": "^9.2.7", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -5390,7 +6079,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3", + "sebastian/type": "^2.3.4", "sebastian/version": "^3.0.2" }, "require-dev": { @@ -5438,11 +6127,11 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13" }, "funding": [ { - "url": "https://phpunit.de/donate.html", + "url": "https://phpunit.de/sponsors.html", "type": "custom" }, { @@ -5450,7 +6139,7 @@ "type": "github" } ], - "time": "2021-03-23T07:16:29+00:00" + "time": "2022-01-24T07:33:35+00:00" }, { "name": "sebastian/cli-parser", @@ -5750,72 +6439,6 @@ ], "time": "2020-10-26T15:52:27+00:00" }, - { - "name": "sebastian/diff", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:10:38+00:00" - }, { "name": "sebastian/environment", "version": "5.1.3", @@ -5881,16 +6504,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", - "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", "shasum": "" }, "require": { @@ -5939,14 +6562,14 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" }, "funding": [ { @@ -5954,20 +6577,20 @@ "type": "github" } ], - "time": "2020-09-28T05:24:23+00:00" + "time": "2021-11-11T14:18:36+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.2", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "a90ccbddffa067b51f574dea6eb25d5680839455" + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455", - "reference": "a90ccbddffa067b51f574dea6eb25d5680839455", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", "shasum": "" }, "require": { @@ -6010,7 +6633,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" }, "funding": [ { @@ -6018,7 +6641,7 @@ "type": "github" } ], - "time": "2020-10-26T15:55:19+00:00" + "time": "2021-06-11T13:31:12+00:00" }, { "name": "sebastian/lines-of-code", @@ -6370,16 +6993,16 @@ }, { "name": "sebastian/type", - "version": "2.3.1", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2" + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2", - "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", "shasum": "" }, "require": { @@ -6414,7 +7037,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/2.3.1" + "source": "https://github.com/sebastianbergmann/type/tree/2.3.4" }, "funding": [ { @@ -6422,7 +7045,7 @@ "type": "github" } ], - "time": "2020-10-26T13:18:59+00:00" + "time": "2021-06-15T12:49:02+00:00" }, { "name": "sebastian/version", @@ -6479,16 +7102,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.0", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", + "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", "shasum": "" }, "require": { @@ -6531,94 +7154,27 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-04-09T00:54:41+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-12-12T21:44:58+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.2.4", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce" + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", - "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -6651,75 +7207,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.2.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-01-27T12:56:27+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" }, "funding": [ { @@ -6735,25 +7223,25 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.2.7", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "d99310c33e833def36419c284f60e8027d359678" + "reference": "395220730edceb6bd745236ccb5c9125c748f779" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d99310c33e833def36419c284f60e8027d359678", - "reference": "d99310c33e833def36419c284f60e8027d359678", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779", + "reference": "395220730edceb6bd745236ccb5c9125c748f779", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/service-contracts": "^1.0|^2" + "symfony/service-contracts": "^1|^2|^3" }, "type": "library", "autoload": { @@ -6781,7 +7269,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.3.0-BETA1" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.3" }, "funding": [ { @@ -6797,27 +7285,27 @@ "type": "tidelift" } ], - "time": "2021-03-29T15:28:41+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.22", + "version": "v4.4.37", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7" + "reference": "e74eee4ec02de71db3d60151aa5b203c990556df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7", - "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e74eee4ec02de71db3d60151aa5b203c990556df", + "reference": "e74eee4ec02de71db3d60151aa5b203c990556df", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php72": "~1.5", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", @@ -6870,7 +7358,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.22" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.37" }, "funding": [ { @@ -6886,20 +7374,20 @@ "type": "tidelift" } ], - "time": "2021-04-19T13:36:17+00:00" + "time": "2022-01-02T09:41:36+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "75a63c33a8577608444246075ea0af0d052e452a" + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", - "reference": "75a63c33a8577608444246075ea0af0d052e452a", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", "shasum": "" }, "require": { @@ -6928,7 +7416,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/master" + "source": "https://github.com/theseer/tokenizer/tree/1.2.1" }, "funding": [ { @@ -6936,7 +7424,7 @@ "type": "github" } ], - "time": "2020-07-12T23:59:07+00:00" + "time": "2021-07-28T10:34:58+00:00" }, { "name": "webmozart/assert", From 452f6b6d13079473e99b94b9caa5425f74da7302 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 7 Feb 2022 23:00:45 +0700 Subject: [PATCH 042/212] Fixes for tests and new versions of dependencies. --- src/Command/CreateAdminCommand.php | 2 ++ src/Command/CreateBuildCommand.php | 4 ++++ src/Helper/CommandExecutor.php | 2 +- tests/src/DatabaseConnectionTest.php | 6 +++--- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Command/CreateAdminCommand.php b/src/Command/CreateAdminCommand.php index f332091bd..a1cd8b41f 100644 --- a/src/Command/CreateAdminCommand.php +++ b/src/Command/CreateAdminCommand.php @@ -67,5 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $createAdmin->create( $createAdmin->process() ); + + return 0; } } diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index 5b45b4b39..756717b3f 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -97,9 +97,13 @@ public function execute(InputInterface $input, OutputInterface $output) ); $output->writeln('Build Created'); + + return 0; } catch (\Throwable $e) { $output->writeln('Failed'); $output->writeln(\sprintf('%s', $e->getMessage())); } + + return 1; } } diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index ca5c16a04..bbcf6a76a 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -120,7 +120,7 @@ public function executeCommand($args = []) $cwd = $this->buildPath; } - $process = new Process($command, $cwd); + $process = Process::fromShellCommandline($command, $cwd); $process->setTimeout(86400); $env = $this->getDefaultEnv(); diff --git a/tests/src/DatabaseConnectionTest.php b/tests/src/DatabaseConnectionTest.php index f1d7fe629..1a0d764c1 100644 --- a/tests/src/DatabaseConnectionTest.php +++ b/tests/src/DatabaseConnectionTest.php @@ -128,7 +128,7 @@ public function testLastInsertIdForPostgreSQL() $pdoConnection ->method('lastInsertId') ->with('"test_table_id_seq"') - ->willReturn(10); + ->willReturn('10'); $databaseConnection = new DatabaseConnection('pgsql'); $databaseConnection->setPdo($pdoConnection); @@ -154,7 +154,7 @@ public function testLastInsertIdForPostgreSQLWithNonDefaultSequenceName() $pdoConnection ->method('lastInsertId') ->with('"sequence_test_table"') - ->willReturn(10); + ->willReturn('10'); $databaseConnection = new DatabaseConnection('pgsql', null, null, null, 'sequence_%s'); $databaseConnection->setPdo($pdoConnection); @@ -179,7 +179,7 @@ public function testLastInsertIdForMySQL() $pdoConnection ->method('lastInsertId') - ->willReturn(11); + ->willReturn('11'); $databaseConnection = new DatabaseConnection('mysql', null, null, null, 'sequence_%s'); $databaseConnection->setPdo($pdoConnection); From d6f84218f73db9e6600d35a1291cb850d1acfb40 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 7 Feb 2022 23:15:26 +0700 Subject: [PATCH 043/212] Fixes. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index b9b652f35..bacf174bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,3 +14,4 @@ /phpunit.xml.dist export-ignore /phpmd.xml.dist export-ignore /.php_cs.dist export-ignore +/codecov.yml export-ignore From 0454e48e207b7c8de207a4430fcba55f1d01b529 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 17:26:19 +0000 Subject: [PATCH 044/212] Add languages folder to copy & paste ignore --- .php-censor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.php-censor.yml b/.php-censor.yml index cdbed9e1d..9cb0ac853 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -22,6 +22,8 @@ test: php_cpd: allow_failures: true + ignore: + - 'src/Languages' php_loc: allow_failures: true From dfaf4c988ef39c5c0368c9775c230cde788404d6 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 17:46:10 +0000 Subject: [PATCH 045/212] Remove duplicate code --- src/Helper/Diff.php | 55 ----------- src/Model/Base/Build.php | 57 +---------- src/Model/Base/BuildError.php | 35 +------ src/Model/Base/Project.php | 59 +---------- src/Model/Base/ProjectGroup.php | 59 +---------- src/Model/Build/BitbucketBuild.php | 66 ++++--------- src/Model/Build/GithubBuild.php | 39 +------- .../Model/Build/GitGetDiffLineNumberTrait.php | 97 +++++++++++++++++++ src/Traits/Model/HasCreateDateTrait.php | 46 +++++++++ src/Traits/Model/HasUserIdTrait.php | 36 +++++++ 10 files changed, 217 insertions(+), 332 deletions(-) delete mode 100644 src/Helper/Diff.php create mode 100644 src/Traits/Model/Build/GitGetDiffLineNumberTrait.php create mode 100644 src/Traits/Model/HasCreateDateTrait.php create mode 100644 src/Traits/Model/HasUserIdTrait.php diff --git a/src/Helper/Diff.php b/src/Helper/Diff.php deleted file mode 100644 index 573a68d2f..000000000 --- a/src/Helper/Diff.php +++ /dev/null @@ -1,55 +0,0 @@ - - */ -class Diff -{ - /** - * Take a diff - * @param string $diff - * @return array - */ - public function getLinePositions($diff) - { - if (empty($diff)) { - return null; - } - - $rtn = []; - - $diffLines = \explode(PHP_EOL, $diff); - - while (\count($diffLines)) { - $line = \array_shift($diffLines); - - if (\substr($line, 0, 2) == '@@') { - \array_unshift($diffLines, $line); - break; - } - } - - $lineNumber = 0; - $position = 0; - - foreach ($diffLines as $diffLine) { - if (\preg_match('/@@\s+\-[0-9]+\,[0-9]+\s+\+([0-9]+)\,([0-9]+)/', $diffLine, $matches)) { - $lineNumber = (int)$matches[1] - 1; - } - - $rtn[$lineNumber] = $position; - - $lineNumber++; - $position++; - } - - return $rtn; - } -} diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index c906f73fe..f81a0f257 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -9,6 +9,8 @@ use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; use PHPCensor\Store\BuildStore; +use PHPCensor\Traits\Model\HasCreateDateTrait; +use PHPCensor\Traits\Model\HasUserIdTrait; /** * @package PHP Censor @@ -19,6 +21,9 @@ */ class Build extends Model { + use HasUserIdTrait; + use HasCreateDateTrait; + public const STATUS_PENDING = 0; public const STATUS_RUNNING = 1; public const STATUS_SUCCESS = 2; @@ -300,36 +305,6 @@ public function setTag(?string $value) return $this->setModified('tag'); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() - { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; - } - - /** - * @return bool - */ - public function setCreateDate(DateTime $value) - { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); - } - /** * @return DateTime|null * @@ -521,28 +496,6 @@ public function setSource(?int $value) return $this->setModified('source'); } - /** - * @return int|null - */ - public function getUserId() - { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; - } - - /** - * @return bool - */ - public function setUserId(?int $value) - { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); - } - /** * @return int * diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index c6f4e2183..645dbfa6f 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -4,9 +4,8 @@ namespace PHPCensor\Model\Base; -use DateTime; -use Exception; use PHPCensor\Model; +use PHPCensor\Traits\Model\HasCreateDateTrait; /** * @package PHP Censor @@ -17,6 +16,8 @@ */ class BuildError extends Model { + use HasCreateDateTrait; + public const SEVERITY_CRITICAL = 0; public const SEVERITY_HIGH = 1; public const SEVERITY_NORMAL = 2; @@ -212,36 +213,6 @@ public function setMessage(string $value) return $this->setModified('message'); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() - { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; - } - - /** - * @return bool - */ - public function setCreateDate(DateTime $value) - { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); - } - /** * @return string */ diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 274c16dea..f98310192 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -4,10 +4,10 @@ namespace PHPCensor\Model\Base; -use DateTime; -use Exception; use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Model; +use PHPCensor\Traits\Model\HasCreateDateTrait; +use PHPCensor\Traits\Model\HasUserIdTrait; /** * @package PHP Censor @@ -18,6 +18,9 @@ */ class Project extends Model { + use HasCreateDateTrait; + use HasUserIdTrait; + public const TYPE_LOCAL = 'local'; public const TYPE_GIT = 'git'; public const TYPE_GITHUB = 'github'; @@ -392,56 +395,4 @@ public function setGroupId(int $value) return $this->setModified('group_id'); } - - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() - { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; - } - - /** - * @return bool - */ - public function setCreateDate(DateTime $value) - { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); - } - - /** - * @return int|null - */ - public function getUserId() - { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; - } - - /** - * @return bool - */ - public function setUserId(?int $value) - { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); - } } diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index 0862f2f42..ac1413b07 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -4,9 +4,9 @@ namespace PHPCensor\Model\Base; -use DateTime; -use Exception; use PHPCensor\Model; +use PHPCensor\Traits\Model\HasCreateDateTrait; +use PHPCensor\Traits\Model\HasUserIdTrait; /** * @package PHP Censor @@ -16,6 +16,9 @@ */ class ProjectGroup extends Model { + use HasCreateDateTrait; + use HasUserIdTrait; + protected array $data = [ 'id' => null, 'title' => null, @@ -66,56 +69,4 @@ public function setTitle(string $value) return $this->setModified('title'); } - - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() - { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; - } - - /** - * @return bool - */ - public function setCreateDate(DateTime $value) - { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); - } - - /** - * @return string|null - */ - public function getUserId() - { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; - } - - /** - * @return bool - */ - public function setUserId(?int $value) - { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); - } } diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 7159cf337..6c3ebece9 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -9,6 +9,7 @@ use PHPCensor\Helper\Diff; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; +use PHPCensor\Traits\Model\Build\GitGetDiffLineNumberTrait; /** * BitBucket Build Model @@ -21,10 +22,12 @@ */ class BitbucketBuild extends GitBuild { + use GitGetDiffLineNumberTrait; + public static array $pullrequestTriggersToSources = [ - 'pullrequest:created' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, - 'pullrequest:updated' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, - 'pullrequest:approved' => Build::SOURCE_WEBHOOK_PULL_REQUEST_APPROVED, + 'pullrequest:created' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, + 'pullrequest:updated' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, + 'pullrequest:approved' => Build::SOURCE_WEBHOOK_PULL_REQUEST_APPROVED, 'pullrequest:fulfilled' => Build::SOURCE_WEBHOOK_PULL_REQUEST_MERGED, ]; @@ -55,7 +58,7 @@ public function getBranchLink() */ public function getRemoteBranchLink() { - $remoteBranch = $this->getExtra('remote_branch'); + $remoteBranch = $this->getExtra('remote_branch'); $remoteReference = $this->getExtra('remote_reference'); return 'https://bitbucket.org/' . $remoteReference . '/src/?at=' . $remoteBranch; @@ -87,7 +90,7 @@ public function sendStatusPostback() return false; } - $username = $this->configuration->get('php-censor.bitbucket.username'); + $username = $this->configuration->get('php-censor.bitbucket.username'); $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); if (empty($username) || empty($appPassword) || empty($this->data['id'])) { @@ -134,19 +137,19 @@ public function sendStatusPostback() ); $client = new Client([ - 'base_uri' => 'https://api.bitbucket.org', + 'base_uri' => 'https://api.bitbucket.org', 'http_errors' => false, ]); $response = $client->post($url, [ - 'auth' => [$username, $appPassword], + 'auth' => [$username, $appPassword], 'headers' => [ 'Content-Type' => 'application/json', ], 'json' => [ - 'state' => $status, - 'key' => 'PHP-CENSOR', - 'url' => $phpCensorUrl . '/build/view/' . $this->getId(), - 'name' => 'PHP Censor Build #' . $this->getId(), + 'state' => $status, + 'key' => 'PHP-CENSOR', + 'url' => $phpCensorUrl . '/build/view/' . $this->getId(), + 'name' => 'PHP Censor Build #' . $this->getId(), 'description' => $description, ], ]); @@ -189,7 +192,7 @@ public function getFileLinkTemplate() */ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = null) { - $success = true; + $success = true; $skipGitFinalization = false; try { @@ -271,9 +274,9 @@ public function reportError( if (!\is_null($diffLineNumber)) { $helper = new Bitbucket($this->configuration); - $repo = $this->getProject()->getReference(); + $repo = $this->getProject()->getReference(); $prNumber = $this->getExtra('pull_request_number'); - $commit = $this->getCommitId(); + $commit = $this->getCommitId(); if (!empty($prNumber)) { if ($allowCommentPullRequest) { @@ -291,39 +294,4 @@ public function reportError( $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); } } - - /** - * Uses git diff to figure out what the diff line position is, based on the error line number. - * - * @param string $file - * @param int $line - * - * @return int|null - */ - protected function getDiffLineNumber(Builder $builder, $file, $line) - { - $builder->logExecOutput(false); - - $line = (int)$line; - $prNumber = $this->getExtra('pull_request_number'); - $path = $builder->buildPath; - - if (!empty($prNumber)) { - $builder->executeCommand('cd "%s" && git diff "origin/%s" "%s"', $path, $this->getBranch(), $file); - } else { - $commitId = $this->getCommitId(); - $compare = empty($commitId) ? 'HEAD' : $commitId; - - $builder->executeCommand('cd "%s" && git diff "%s^^" "%s"', $path, $compare, $file); - } - - $builder->logExecOutput(true); - - $diff = $builder->getLastOutput(); - - $helper = new Diff(); - $lines = $helper->getLinePositions($diff); - - return isset($lines[$line]) ? $lines[$line] : null; - } } diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 205107500..11c4d3f5b 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -5,10 +5,10 @@ use Exception; use GuzzleHttp\Client; use PHPCensor\Builder; -use PHPCensor\Helper\Diff; use PHPCensor\Helper\Github; use PHPCensor\Model\Build; use PHPCensor\Model\BuildError; +use PHPCensor\Traits\Model\Build\GitGetDiffLineNumberTrait; /** * Github Build Model @@ -21,6 +21,8 @@ */ class GithubBuild extends GitBuild { + use GitGetDiffLineNumberTrait; + public static array $pullrequestTriggersToSources = [ 'opened' => Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED, 'synchronize' => Build::SOURCE_WEBHOOK_PULL_REQUEST_UPDATED, @@ -311,39 +313,4 @@ public function reportError( $builder->getBuildLogger()->logFailure('Exception: ' . $e->getMessage(), $e); } } - - /** - * Uses git diff to figure out what the diff line position is, based on the error line number. - * - * @param string $file - * @param int $line - * - * @return int|null - */ - protected function getDiffLineNumber(Builder $builder, $file, $line) - { - $builder->logExecOutput(false); - - $line = (int)$line; - $prNumber = $this->getExtra('pull_request_number'); - $path = $builder->buildPath; - - if (!empty($prNumber)) { - $builder->executeCommand('cd "%s" && git diff "origin/%s" "%s"', $path, $this->getBranch(), $file); - } else { - $commitId = $this->getCommitId(); - $compare = empty($commitId) ? 'HEAD' : $commitId; - - $builder->executeCommand('cd "%s" && git diff "%s^^" "%s"', $path, $compare, $file); - } - - $builder->logExecOutput(true); - - $diff = $builder->getLastOutput(); - - $helper = new Diff(); - $lines = $helper->getLinePositions($diff); - - return isset($lines[$line]) ? $lines[$line] : null; - } } diff --git a/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php new file mode 100644 index 000000000..a511fb6b0 --- /dev/null +++ b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php @@ -0,0 +1,97 @@ + + * + * @mixin GitBuild + */ +trait GitGetDiffLineNumberTrait +{ + /** + * Uses git diff to figure out what the diff line position is, based on the error line number. + * + * @param Builder $builder + * @param string $file + * @param int $line + * + * @return int|null + */ + protected function getDiffLineNumber(Builder $builder, string $file, int $line): ?int + { + $builder->logExecOutput(false); + + $line = (int)$line; + $prNumber = $this->getExtra('pull_request_number'); + $path = $builder->buildPath; + + if (!empty($prNumber)) { + $builder->executeCommand('cd "%s" && git diff "origin/%s" "%s"', $path, $this->getBranch(), $file); + } else { + $commitId = $this->getCommitId(); + $compare = empty($commitId) ? 'HEAD' : $commitId; + + $builder->executeCommand('cd "%s" && git diff "%s^^" "%s"', $path, $compare, $file); + } + + $builder->logExecOutput(true); + + $diff = $builder->getLastOutput(); + + $lines = $this->getLinePositions($diff); + + return $lines[$line] ?? null; + } + + /** + * Take a diff + * @param string $diff + * @return array + */ + private function getLinePositions(string $diff): ?array + { + if (empty($diff)) { + return null; + } + + $rtn = []; + + $diffLines = explode(PHP_EOL, $diff); + + while (count($diffLines)) { + $line = array_shift($diffLines); + + if (substr($line, 0, 2) == '@@') { + array_unshift($diffLines, $line); + break; + } + } + + $lineNumber = 0; + $position = 0; + + foreach ($diffLines as $diffLine) { + if (preg_match('/@@\s+\-[0-9]+\,[0-9]+\s+\+([0-9]+)\,([0-9]+)/', $diffLine, $matches)) { + $lineNumber = (int)$matches[1] - 1; + } + + $rtn[$lineNumber] = $position; + + $lineNumber++; + $position++; + } + + return $rtn; + } +} diff --git a/src/Traits/Model/HasCreateDateTrait.php b/src/Traits/Model/HasCreateDateTrait.php new file mode 100644 index 000000000..bfdcf7f4a --- /dev/null +++ b/src/Traits/Model/HasCreateDateTrait.php @@ -0,0 +1,46 @@ +data['create_date']) { + return new DateTime($this->data['create_date']); + } + + return null; + } + + /** + * @param DateTime $value + * @return bool + */ + public function setCreateDate(DateTime $value): bool + { + $stringValue = $value->format('Y-m-d H:i:s'); + + if ($this->data['create_date'] === $stringValue) { + return false; + } + + $this->data['create_date'] = $stringValue; + + return $this->setModified('create_date'); + } +} diff --git a/src/Traits/Model/HasUserIdTrait.php b/src/Traits/Model/HasUserIdTrait.php new file mode 100644 index 000000000..6253a3968 --- /dev/null +++ b/src/Traits/Model/HasUserIdTrait.php @@ -0,0 +1,36 @@ +data['user_id']) ? (int)$this->data['user_id'] : null; + } + + /** + * @param int|null $value + * @return bool + */ + public function setUserId(?int $value): bool + { + if ($this->data['user_id'] === $value) { + return false; + } + + $this->data['user_id'] = $value; + + return $this->setModified('user_id'); + } +} From 4db2de2467ee31024010470da3d7cb39389b3650 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 17:49:42 +0000 Subject: [PATCH 046/212] Remove docs as per coding standards fixer --- src/Traits/Model/Build/GitGetDiffLineNumberTrait.php | 9 --------- src/Traits/Model/HasCreateDateTrait.php | 6 ------ src/Traits/Model/HasUserIdTrait.php | 7 ------- 3 files changed, 22 deletions(-) diff --git a/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php index a511fb6b0..fde946260 100644 --- a/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php +++ b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php @@ -21,18 +21,11 @@ trait GitGetDiffLineNumberTrait { /** * Uses git diff to figure out what the diff line position is, based on the error line number. - * - * @param Builder $builder - * @param string $file - * @param int $line - * - * @return int|null */ protected function getDiffLineNumber(Builder $builder, string $file, int $line): ?int { $builder->logExecOutput(false); - $line = (int)$line; $prNumber = $this->getExtra('pull_request_number'); $path = $builder->buildPath; @@ -56,8 +49,6 @@ protected function getDiffLineNumber(Builder $builder, string $file, int $line): /** * Take a diff - * @param string $diff - * @return array */ private function getLinePositions(string $diff): ?array { diff --git a/src/Traits/Model/HasCreateDateTrait.php b/src/Traits/Model/HasCreateDateTrait.php index bfdcf7f4a..3efaac2fd 100644 --- a/src/Traits/Model/HasCreateDateTrait.php +++ b/src/Traits/Model/HasCreateDateTrait.php @@ -14,8 +14,6 @@ trait HasCreateDateTrait { /** - * @return DateTime|null - * * @throws Exception */ public function getCreateDate(): ?DateTime @@ -27,10 +25,6 @@ public function getCreateDate(): ?DateTime return null; } - /** - * @param DateTime $value - * @return bool - */ public function setCreateDate(DateTime $value): bool { $stringValue = $value->format('Y-m-d H:i:s'); diff --git a/src/Traits/Model/HasUserIdTrait.php b/src/Traits/Model/HasUserIdTrait.php index 6253a3968..95602b417 100644 --- a/src/Traits/Model/HasUserIdTrait.php +++ b/src/Traits/Model/HasUserIdTrait.php @@ -11,18 +11,11 @@ */ trait HasUserIdTrait { - /** - * @return int|null - */ public function getUserId(): ?int { return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; } - /** - * @param int|null $value - * @return bool - */ public function setUserId(?int $value): bool { if ($this->data['user_id'] === $value) { From 9b440fb26b7dbe62e05dbbcfd36b8c5462827bba Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 22:55:43 +0000 Subject: [PATCH 047/212] Initial model refactor --- src/Model.php | 93 ++++- src/Model/Base/Build.php | 572 ++++++++--------------------- src/Model/Base/BuildError.php | 262 +++---------- src/Model/Base/BuildMeta.php | 90 +---- src/Model/Base/Environment.php | 96 ++--- src/Model/Base/Project.php | 405 +++++--------------- src/Model/Base/ProjectGroup.php | 99 +---- src/Model/Base/User.php | 215 ++--------- src/Model/Build.php | 5 +- src/Model/Build/BitbucketBuild.php | 2 +- src/Model/Build/GithubBuild.php | 2 +- 11 files changed, 486 insertions(+), 1355 deletions(-) diff --git a/src/Model.php b/src/Model.php index 8c43473f9..46be16eaa 100644 --- a/src/Model.php +++ b/src/Model.php @@ -4,6 +4,9 @@ namespace PHPCensor; +use DateTime; +use Exception; + /** * @package PHP Censor * @subpackage Application @@ -15,7 +18,9 @@ class Model { protected array $data = []; - protected array $modified = []; + protected array $casts = []; + + private array $modified = []; protected StoreRegistry $storeRegistry; @@ -23,23 +28,42 @@ public function __construct( StoreRegistry $storeRegistry, array $initialData = [] ) { - if (\is_array($initialData)) { - foreach ($initialData as $index => $item) { - if (\array_key_exists($index, $this->data)) { - if ('id' === \substr($index, - 2) && null !== $item) { - $this->data[$index] = (int)$item; - continue; - } + if (!isset($this->casts['id'])) { + $this->casts['id'] = 'integer'; + } - $this->data[$index] = $item; - } + foreach ($initialData as $index => $item) { + if (!array_key_exists($index, $this->data)) { + continue; } + + $this->data[$index] = $item; } $this->storeRegistry = $storeRegistry; } + protected function getData(string $column, $defaultValue = null) + { + return $this->cast($this->casts[$column] ?? 'string', $this->data[$column] ?? $defaultValue); + } + + protected function setData(string $column, $value): bool + { + if ($this->data[$column] === $value) { + return false; + } + + // date time + // $stringValue = $value->format('Y-m-d H:i:s'); + + $this->data[$column] = $value; + $this->modified[$column] = $column; + + return true; + } + public function getDataArray(): array { return $this->data; @@ -50,10 +74,53 @@ public function getModified(): array return $this->modified; } - protected function setModified(string $column): bool + private function cast($type, $value) { - $this->modified[$column] = $column; + if (is_null($value)) { + return null; + } - return true; + switch ($type) { + case 'integer': + case 'int': + return intval($value); + + case 'bool': + case 'boolean': + return boolval($value); + + case 'float': + return floatval($value); + + case 'array': + return json_decode($value, true); + + case 'datetime': + try { + return new DateTime($value); + } catch (Exception $e) { + return null; + } + + default: + return $value; + } + } + + /** + * @return int + */ + public function getId(): int + { + return $this->getData('id'); + } + + /** + * @param int $value + * @return bool + */ + public function setId(int $value): bool + { + return $this->setData('id', $value); } } diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index c906f73fe..35544a382 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -7,6 +7,7 @@ use DateTime; use Exception; use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Model; use PHPCensor\Store\BuildStore; @@ -22,41 +23,57 @@ class Build extends Model public const STATUS_PENDING = 0; public const STATUS_RUNNING = 1; public const STATUS_SUCCESS = 2; - public const STATUS_FAILED = 3; - - public const SOURCE_UNKNOWN = 0; - public const SOURCE_MANUAL_WEB = 1; - public const SOURCE_MANUAL_CONSOLE = 2; - public const SOURCE_PERIODICAL = 3; - public const SOURCE_WEBHOOK_PUSH = 4; - public const SOURCE_WEBHOOK_PULL_REQUEST_CREATED = 5; - public const SOURCE_WEBHOOK_PULL_REQUEST_UPDATED = 6; + public const STATUS_FAILED = 3; + + public const SOURCE_UNKNOWN = 0; + public const SOURCE_MANUAL_WEB = 1; + public const SOURCE_MANUAL_CONSOLE = 2; + public const SOURCE_PERIODICAL = 3; + public const SOURCE_WEBHOOK_PUSH = 4; + public const SOURCE_WEBHOOK_PULL_REQUEST_CREATED = 5; + public const SOURCE_WEBHOOK_PULL_REQUEST_UPDATED = 6; public const SOURCE_WEBHOOK_PULL_REQUEST_APPROVED = 7; - public const SOURCE_WEBHOOK_PULL_REQUEST_MERGED = 8; - public const SOURCE_MANUAL_REBUILD_WEB = 9; - public const SOURCE_MANUAL_REBUILD_CONSOLE = 10; + public const SOURCE_WEBHOOK_PULL_REQUEST_MERGED = 8; + public const SOURCE_MANUAL_REBUILD_WEB = 9; + public const SOURCE_MANUAL_REBUILD_CONSOLE = 10; protected array $data = [ - 'id' => null, - 'parent_id' => null, - 'project_id' => null, - 'commit_id' => null, - 'status' => null, - 'log' => null, - 'branch' => null, - 'tag' => null, - 'create_date' => null, - 'start_date' => null, - 'finish_date' => null, - 'committer_email' => null, - 'commit_message' => null, - 'extra' => null, - 'environment_id' => null, - 'source' => Build::SOURCE_UNKNOWN, - 'user_id' => null, - 'errors_total' => null, + 'id' => null, + 'parent_id' => null, + 'project_id' => null, + 'commit_id' => null, + 'status' => null, + 'log' => null, + 'branch' => null, + 'tag' => null, + 'create_date' => null, + 'start_date' => null, + 'finish_date' => null, + 'committer_email' => null, + 'commit_message' => null, + 'extra' => [], + 'environment_id' => null, + 'source' => Build::SOURCE_UNKNOWN, + 'user_id' => null, + 'errors_total' => null, 'errors_total_previous' => null, - 'errors_new' => null, + 'errors_new' => null, + ]; + + protected array $casts = [ + 'project_id' => 'integer', + 'status' => 'integer', + 'create_date' => 'datetime', + 'start_date' => 'datetime', + 'finish_date' => 'datetime', + 'extra' => 'array', + 'environment_id' => 'integer', + 'source' => 'integer', + 'user_id' => 'integer', + 'errors_total' => 'integer', + 'errors_total_previous' => 'integer', + 'errors_new' => 'integer', + 'parent_id' => 'integer', ]; protected array $allowedStatuses = [ @@ -80,431 +97,191 @@ class Build extends Model self::SOURCE_WEBHOOK_PULL_REQUEST_MERGED, ]; - /** - * @return int - */ - public function getId() + public function getParentId(): int { - return (int)$this->data['id']; + return $this->getData('parent_id'); } - /** - * @return bool - */ - public function setId(int $value) + public function setParentId(?int $value): bool { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = (int)$value; - - return $this->setModified('id'); + return $this->setData('parent_id', $value); } - /** - * @return int|null - */ - public function getParentId() + public function getProjectId(): int { - return (null !== $this->data['parent_id']) ? (int)$this->data['parent_id'] : null; + return $this->getData('project_id'); } - /** - * @return bool - */ - public function setParentId(?int $value) + public function setProjectId(int $value): bool { - if ($this->data['parent_id'] === $value) { - return false; - } - - $this->data['parent_id'] = $value; - - return $this->setModified('parent_id'); + return $this->setData('project_id', $value); } - /** - * @return int - */ - public function getProjectId() + public function getCommitId(): string { - return (int)$this->data['project_id']; + return $this->getData('commit_id'); } - /** - * @return bool - */ - public function setProjectId(int $value) + public function setCommitId(string $value): bool { - if ($this->data['project_id'] === $value) { - return false; - } - - $this->data['project_id'] = $value; - - return $this->setModified('project_id'); + return $this->setData('commit_id', $value); } - /** - * @return string - */ - public function getCommitId() + public function getStatus(): int { - return $this->data['commit_id']; + return $this->getData('status'); } /** - * @return bool - */ - public function setCommitId(string $value) - { - if ($this->data['commit_id'] === $value) { - return false; - } - - $this->data['commit_id'] = $value; - - return $this->setModified('commit_id'); - } - - /** - * @return int - */ - public function getStatus() - { - return (int)$this->data['status']; - } - - /** - * @return bool - * * @throws InvalidArgumentException */ - public function setStatus(int $value) + public function setStatus(int $value): bool { - if (!\in_array($value, $this->allowedStatuses, true)) { + if (!in_array($value, $this->allowedStatuses, true)) { throw new InvalidArgumentException( 'Column "status" must be one of: ' . \join(', ', $this->allowedStatuses) . '.' ); } - if ($this->data['status'] === $value) { - return false; - } - - $this->data['status'] = $value; - - return $this->setModified('status'); + return $this->setData('status', $value); } - public function setStatusPending() + public function setStatusPending(): bool { - if (self::STATUS_PENDING !== $this->data['status']) { - $this->setModified('status'); - } - - $this->data['status'] = self::STATUS_PENDING; + return $this->setData('status', self::STATUS_PENDING); } - public function setStatusRunning() + public function setStatusRunning(): bool { - if (self::STATUS_RUNNING !== $this->data['status']) { - $this->setModified('status'); - } - - $this->data['status'] = self::STATUS_RUNNING; + return $this->setData('status', self::STATUS_RUNNING); } - public function setStatusSuccess() + public function setStatusSuccess(): bool { - if (self::STATUS_SUCCESS !== $this->data['status']) { - $this->setModified('status'); - } - - $this->data['status'] = self::STATUS_SUCCESS; + return $this->setData('status', self::STATUS_SUCCESS); } - public function setStatusFailed() + public function setStatusFailed(): bool { - if (self::STATUS_FAILED !== $this->data['status']) { - $this->setModified('status'); - } - - $this->data['status'] = self::STATUS_FAILED; + return $this->setData('status', self::STATUS_FAILED); } - /** - * @return string - */ - public function getLog() + public function getLog(): string { - return $this->data['log']; + return $this->getData('log'); } - /** - * @return bool - */ - public function setLog(?string $value) + public function setLog(?string $value): bool { - if ($this->data['log'] === $value) { - return false; - } - - $this->data['log'] = $value; - - return $this->setModified('log'); + return $this->setData('log', $value); } - /** - * @return string - */ - public function getBranch() + public function getBranch(): string { - return $this->data['branch']; + return $this->getData('branch'); } - /** - * @return bool - */ public function setBranch(string $value) { - if ($this->data['branch'] === $value) { - return false; - } - - $this->data['branch'] = $value; - - return $this->setModified('branch'); + return $this->setData('branch', $value); } - /** - * @return string - */ - public function getTag() + public function getTag(): string { - return $this->data['tag']; + return $this->getData('tag'); } - /** - * @return bool - */ - public function setTag(?string $value) + public function setTag(?string $value): bool { - if ($this->data['tag'] === $value) { - return false; - } - - $this->data['tag'] = $value; - - return $this->setModified('tag'); + return $this->setData('tag', $value); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() + public function getCreateDate(): ?DateTime { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; + return $this->getData('create_date'); } - /** - * @return bool - */ - public function setCreateDate(DateTime $value) + public function setCreateDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); + return $this->setData('create_date', $value); } - - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getStartDate() + public function getStartDate(): ?DateTime { - if ($this->data['start_date']) { - return new DateTime($this->data['start_date']); - } - - return null; + return $this->getData('start_date'); } - /** - * @return bool - */ - public function setStartDate(DateTime $value) + public function setStartDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['start_date'] === $stringValue) { - return false; - } - - $this->data['start_date'] = $stringValue; - - return $this->setModified('start_date'); + return $this->setData('start_date', $value); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getFinishDate() + public function getFinishDate(): ?DateTime { - if ($this->data['finish_date']) { - return new DateTime($this->data['finish_date']); - } - - return null; + return $this->getData('finish_date'); } - /** - * @return bool - */ - public function setFinishDate(DateTime $value) + public function setFinishDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['finish_date'] === $stringValue) { - return false; - } - - $this->data['finish_date'] = $stringValue; - - return $this->setModified('finish_date'); + return $this->setData('finish_date', $value); } - /** - * @return string - */ - public function getCommitterEmail() + public function getCommitterEmail(): ?string { - return $this->data['committer_email']; + return $this->getData('committer_email'); } - /** - * @return bool - */ - public function setCommitterEmail(?string $value) + public function setCommitterEmail(?string $value): bool { - if ($this->data['committer_email'] === $value) { - return false; - } - - $this->data['committer_email'] = $value; - - return $this->setModified('committer_email'); + return $this->setData('committer_email', $value); } - /** - * @return string - */ - public function getCommitMessage() + public function getCommitMessage(): ?string { - return $this->data['commit_message']; + return $this->getData('commit_message'); } - /** - * @return bool - */ - public function setCommitMessage(?string $value) + public function setCommitMessage(?string $value): bool { - if ($this->data['commit_message'] === $value) { - return false; - } - - $this->data['commit_message'] = $value; - - return $this->setModified('commit_message'); + return $this->setData('commit_message', $value); } /** - * @param string|null $key - * - * @return array|string|null + * @return mixed */ - public function getExtra($key = null) - { - $data = \json_decode($this->data['extra'], true); - $extra = null; - if (\is_null($key)) { - $extra = $data; - } elseif (isset($data[$key])) { - $extra = $data[$key]; + public function getExtra(string $key = null) + { + $data = $this->getData('extra'); + if ($key === null) { + return $data; } - return $extra; + return $data[$key] ?? null; } - /** - * @return bool - */ - public function setExtra(array $value) + public function setExtra(array $value): bool { - $extra = \json_encode($value); - if ($this->data['extra'] === $extra) { - return false; - } - - $this->data['extra'] = $extra; - - return $this->setModified('extra'); + return $this->setData('extra', $value); } - /** - * @return int|null - */ - public function getEnvironmentId() + public function getEnvironmentId(): ?int { - return (null !== $this->data['environment_id']) ? (int)$this->data['environment_id'] : null; + return $this->getData('environment_id'); } - /** - * @return bool - * - * @throws InvalidArgumentException - */ - public function setEnvironmentId(?int $value) + public function setEnvironmentId(?int $value): bool { - if ($this->data['environment_id'] === $value) { - return false; - } - - $this->data['environment_id'] = $value; - - return $this->setModified('environment_id'); + return $this->setData('environment_id', $value); } - /** - * @return int - */ - public function getSource() + public function getSource(): ?int { - return (int)$this->data['source']; + return $this->getData('source'); } /** - * @return bool - * * @throws InvalidArgumentException */ - public function setSource(?int $value) + public function setSource(?int $value): bool { if (!\in_array($value, $this->allowedSources, true)) { throw new InvalidArgumentException( @@ -512,46 +289,26 @@ public function setSource(?int $value) ); } - if ($this->data['source'] === $value) { - return false; - } - - $this->data['source'] = $value; - - return $this->setModified('source'); + return $this->setData('source', $value); } - /** - * @return int|null - */ - public function getUserId() + public function getUserId(): ?int { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; + return $this->getData('user_id'); } - /** - * @return bool - */ - public function setUserId(?int $value) + public function setUserId(?int $value): bool { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); + return $this->setData('user_id', $value); } /** - * @return int - * - * @throws InvalidArgumentException + * @throws InvalidArgumentException|RuntimeException */ - public function getErrorsTotal() + public function getErrorsTotal(): ?int { - if (null === $this->data['errors_total'] && - !\in_array($this->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true)) { + if ($this->getData('errors_total') === null && + !in_array($this->getStatus(), [self::STATUS_PENDING, self::STATUS_RUNNING], true)) { /** @var BuildStore $store */ $store = $this->storeRegistry->get('Build'); @@ -559,31 +316,20 @@ public function getErrorsTotal() $store->save($this); } - return $this->data['errors_total']; + return $this->getData('errors_total'); } - /** - * @return bool - */ - public function setErrorsTotal(int $value) + public function setErrorsTotal(int $value): bool { - if ($this->data['errors_total'] === $value) { - return false; - } - - $this->data['errors_total'] = $value; - - return $this->setModified('errors_total'); + return $this->setData('errors_total', $value); } /** - * @return int|null - * * @throws Exception */ - public function getErrorsTotalPrevious() + public function getErrorsTotalPrevious(): ?int { - if (null === $this->data['errors_total_previous']) { + if ($this->getData('errors_total_previous') === null) { /** @var BuildStore $store */ $store = $this->storeRegistry->get('Build'); @@ -603,31 +349,23 @@ public function getErrorsTotalPrevious() } } - return $this->data['errors_total_previous']; + return $this->getData('errors_total_previous'); } /** * @return bool */ - public function setErrorsTotalPrevious(int $value) + public function setErrorsTotalPrevious(int $value): bool { - if ($this->data['errors_total_previous'] === $value) { - return false; - } - - $this->data['errors_total_previous'] = $value; - - return $this->setModified('errors_total_previous'); + return $this->setData('errors_total_previous', $value); } /** - * @return int - * - * @throws InvalidArgumentException + * @throws InvalidArgumentException|RuntimeException */ - public function getErrorsNew() + public function getErrorsNew(): ?int { - if (null === $this->data['errors_new']) { + if ($this->getData('errors_new') === null) { /** @var BuildStore $errorStore */ $store = $this->storeRegistry->get('Build'); @@ -638,36 +376,16 @@ public function getErrorsNew() $store->save($this); } - return $this->data['errors_new']; + return $this->getData('errors_new'); } - /** - * @return bool - */ - public function setErrorsNew(int $value) + public function setErrorsNew(int $value): bool { - if ($this->data['errors_new'] === $value) { - return false; - } - - $this->data['errors_new'] = $value; - - return $this->setModified('errors_new'); + return $this->setData('errors_new', $value); } - /** - * @return bool - */ - public function isDebug() + public function isDebug(): bool { - if (\defined('DEBUG_MODE') && DEBUG_MODE) { - return true; - } - - if ($this->getExtra('debug')) { - return true; - } - - return false; + return (defined('DEBUG_MODE') && DEBUG_MODE) || $this->getExtra('debug'); } } diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index c6f4e2183..134083c87 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -18,271 +18,129 @@ class BuildError extends Model { public const SEVERITY_CRITICAL = 0; - public const SEVERITY_HIGH = 1; - public const SEVERITY_NORMAL = 2; - public const SEVERITY_LOW = 3; + public const SEVERITY_HIGH = 1; + public const SEVERITY_NORMAL = 2; + public const SEVERITY_LOW = 3; protected array $data = [ - 'id' => null, - 'build_id' => null, - 'plugin' => null, - 'file' => null, - 'line_start' => null, - 'line_end' => null, - 'severity' => null, - 'message' => null, + 'id' => null, + 'build_id' => null, + 'plugin' => null, + 'file' => null, + 'line_start' => null, + 'line_end' => null, + 'severity' => null, + 'message' => null, 'create_date' => null, - 'hash' => '', - 'is_new' => 0, + 'hash' => '', + 'is_new' => 0, ]; - /** - * @return int - */ - public function getId() - { - return (int)$this->data['id']; - } + protected array $casts = [ + 'build_id' => 'integer', + 'line_start' => 'integer', + 'line_end' => 'integer', + 'severity' => 'integer', + 'is_new' => 'boolean' + ]; - /** - * @return bool - */ - public function setId(int $value) + public function getBuildId(): int { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); + return $this->getData('build_id'); } - /** - * @return int - */ - public function getBuildId() + public function setBuildId(int $value): bool { - return (int)$this->data['build_id']; + return $this->setData('build_id', $value); } - /** - * @return bool - */ - public function setBuildId(int $value) + public function getPlugin(): string { - if ($this->data['build_id'] === $value) { - return false; - } - - $this->data['build_id'] = $value; - - return $this->setModified('build_id'); + return $this->getData('plugin'); } - /** - * @return string - */ - public function getPlugin() + public function setPlugin(string $value): bool { - return $this->data['plugin']; + return $this->setData('plugin', $value); } - /** - * @return bool - */ - public function setPlugin(string $value) + public function getFile(): string { - if ($this->data['plugin'] === $value) { - return false; - } - - $this->data['plugin'] = $value; - - return $this->setModified('plugin'); + return $this->getData('file'); } - /** - * @return string - */ - public function getFile() + public function setFile(?string $value): bool { - return $this->data['file']; + return $this->setData('file', $value); } - /** - * @return bool - */ - public function setFile(?string $value) + public function getLineStart(): int { - if ($this->data['file'] === $value) { - return false; - } - - $this->data['file'] = $value; - - return $this->setModified('file'); + return $this->getData('line_start'); } - /** - * @return int - */ - public function getLineStart() + public function setLineStart(?int $value): bool { - return (int)$this->data['line_start']; - } - - /** - * @return bool - */ - public function setLineStart(?int $value) - { - if ($this->data['line_start'] === $value) { - return false; - } - - $this->data['line_start'] = $value; - - return $this->setModified('line_start'); + return $this->setData('line_start', $value); } - /** - * @return int - */ - public function getLineEnd() + public function getLineEnd(): int { - return (int)$this->data['line_end']; + return $this->getData('line_end'); } - /** - * @return bool - */ - public function setLineEnd(?int $value) + public function setLineEnd(?int $value): bool { - if ($this->data['line_end'] === $value) { - return false; - } - - $this->data['line_end'] = $value; - - return $this->setModified('line_end'); + return $this->setData('line_end', $value); } - /** - * @return int - */ - public function getSeverity() + public function getSeverity(): int { - return (int)$this->data['severity']; + return $this->getData('severity'); } - /** - * @return bool - */ - public function setSeverity(int $value) + public function setSeverity(int $value): bool { - if ($this->data['severity'] === $value) { - return false; - } - - $this->data['severity'] = $value; - - return $this->setModified('severity'); + return $this->setData('severity', $value); } - /** - * @return string - */ - public function getMessage() + public function getMessage(): string { - return $this->data['message']; + return $this->getData('message'); } - /** - * @return bool - */ - public function setMessage(string $value) + public function setMessage(string $value): bool { - if ($this->data['message'] === $value) { - return false; - } - - $this->data['message'] = $value; - - return $this->setModified('message'); + return $this->setData('message', $value); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() + public function getCreateDate(): ?DateTime { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; + return $this->getData('create_date'); } - /** - * @return bool - */ - public function setCreateDate(DateTime $value) + public function setCreateDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); + return $this->setData('create_date', $value); } - /** - * @return string - */ - public function getHash() + public function getHash(): string { - return $this->data['hash']; + return $this->getData('hash'); } - /** - * @return bool - */ - public function setHash(string $value) + public function setHash(string $value): bool { - if ($this->data['hash'] === $value) { - return false; - } - - $this->data['hash'] = $value; - - return $this->setModified('hash'); + return $this->setData('hash', $value); } - /** - * @return bool - */ - public function getIsNew() + public function getIsNew(): bool { - return (bool)$this->data['is_new']; + return $this->getData('is_new'); } - /** - * @return bool - */ - public function setIsNew(bool $value) + public function setIsNew(bool $value): bool { - if ($this->data['is_new'] === (int)$value) { - return false; - } - - $this->data['is_new'] = (int)$value; - - return $this->setModified('is_new'); + return $this->setData('is_new', $value); } } diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 89979877d..3f30189e3 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -16,97 +16,43 @@ class BuildMeta extends Model { protected array $data = [ - 'id' => null, - 'build_id' => null, - 'meta_key' => null, + 'id' => null, + 'build_id' => null, + 'meta_key' => null, 'meta_value' => null, ]; - /** - * @return int - */ - public function getId() - { - return (int)$this->data['id']; - } - - /** - * @return bool - */ - public function setId(int $value) - { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); - } + protected array $casts = [ + 'build_id' => 'int', + ]; - /** - * @return int - */ - public function getBuildId() + public function getBuildId():int { - return (int)$this->data['build_id']; + return $this->getData('build_id'); } - /** - * @return bool - */ - public function setBuildId(int $value) + public function setBuildId(int $value): bool { - if ($this->data['build_id'] === $value) { - return false ; - } - - $this->data['build_id'] = $value; - - return $this->setModified('build_id'); + return $this->setData('build_id', $value); } - /** - * @return string - */ - public function getMetaKey() + public function getMetaKey(): string { - return $this->data['meta_key']; + return $this->getData('meta_key'); } - /** - * @return bool - */ - public function setMetaKey(string $value) + public function setMetaKey(string $value): bool { - if ($this->data['meta_key'] === $value) { - return false; - } - - $this->data['meta_key'] = $value; - - return $this->setModified('meta_key'); + return $this->setData('meta_key', $value); } - /** - * @return string - */ - public function getMetaValue() + public function getMetaValue(): string { - return $this->data['meta_value']; + return $this->getData('meta_value'); } - /** - * @return bool - */ - public function setMetaValue(string $value) + public function setMetaValue(string $value): bool { - if ($this->data['meta_value'] === $value) { - return false; - } - - $this->data['meta_value'] = $value; - - return $this->setModified('meta_value'); + return $this->setData('meta_value', $value); } } diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index c82e02b1d..73d670726 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -15,103 +15,49 @@ class Environment extends Model { protected array $data = [ - 'id' => null, + 'id' => null, 'project_id' => null, - 'name' => null, - 'branches' => null, + 'name' => null, + 'branches' => [], ]; - /** - * @return int - */ - public function getId() - { - return (int)$this->data['id']; - } - - /** - * @return bool - */ - public function setId(int $value) - { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); - } + protected array $casts = [ + 'project_id' => 'int', + 'branches' => 'array', + ]; - /** - * @return int - */ - public function getProjectId() + public function getProjectId(): int { - return (int)$this->data['project_id']; + return $this->getData('project_id'); } - /** - * @return bool - */ - public function setProjectId(int $value) + public function setProjectId(int $value): bool { - if ($this->data['project_id'] === $value) { - return false; - } - - $this->data['project_id'] = $value; - - return $this->setModified('project_id'); + return $this->setData('project_id', $value); } - /** - * @return string - */ - public function getName() + public function getName(): string { - return $this->data['name']; + return $this->getData('name'); } - /** - * @return bool - */ - public function setName(string $value) + public function setName(string $value): bool { - if ($this->data['name'] === $value) { - return false; - } - - $this->data['name'] = $value; - - return $this->setModified('name'); + return $this->setData('name', $value); } - /** - * @return array - */ - public function getBranches() + public function getBranches(): array { - return \array_filter( - \array_map( + return array_filter( + array_map( 'trim', - \explode("\n", $this->data['branches']) + explode("\n", $this->getData('branches')) ) ); } - /** - * @return bool - */ - public function setBranches(array $value) + public function setBranches(array $value): bool { - $branches = \implode("\n", $value); - if ($this->data['branches'] === $branches) { - return false; - } - - $this->data['branches'] = $branches; - - return $this->setModified('branches'); + return $this->setData('branches', implode("\n", $value)); } } diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index 274c16dea..eff68029c 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -18,39 +18,49 @@ */ class Project extends Model { - public const TYPE_LOCAL = 'local'; - public const TYPE_GIT = 'git'; - public const TYPE_GITHUB = 'github'; - public const TYPE_BITBUCKET = 'bitbucket'; - public const TYPE_GITLAB = 'gitlab'; - public const TYPE_GOGS = 'gogs'; - public const TYPE_HG = 'hg'; - public const TYPE_BITBUCKET_HG = 'bitbucket-hg'; + public const TYPE_LOCAL = 'local'; + public const TYPE_GIT = 'git'; + public const TYPE_GITHUB = 'github'; + public const TYPE_BITBUCKET = 'bitbucket'; + public const TYPE_GITLAB = 'gitlab'; + public const TYPE_GOGS = 'gogs'; + public const TYPE_HG = 'hg'; + public const TYPE_BITBUCKET_HG = 'bitbucket-hg'; public const TYPE_BITBUCKET_SERVER = 'bitbucket-server'; - public const TYPE_SVN = 'svn'; + public const TYPE_SVN = 'svn'; - public const MIN_BUILD_PRIORITY = 1; - public const MAX_BUILD_PRIORITY = 2000; - public const DEFAULT_BUILD_PRIORITY = 1000; + public const MIN_BUILD_PRIORITY = 1; + public const MAX_BUILD_PRIORITY = 2000; + public const DEFAULT_BUILD_PRIORITY = 1000; public const OFFSET_BETWEEN_BUILD_AND_QUEUE = 24; protected array $data = [ - 'id' => null, - 'title' => null, - 'reference' => null, - 'default_branch' => null, - 'default_branch_only' => 0, - 'ssh_private_key' => null, - 'ssh_public_key' => null, - 'type' => null, - 'access_information' => null, - 'build_config' => null, + 'id' => null, + 'title' => null, + 'reference' => null, + 'default_branch' => null, + 'default_branch_only' => 0, + 'ssh_private_key' => null, + 'ssh_public_key' => null, + 'type' => null, + 'access_information' => null, + 'build_config' => null, 'overwrite_build_config' => 1, - 'allow_public_status' => 0, - 'archived' => 0, - 'group_id' => 1, - 'create_date' => null, - 'user_id' => null, + 'allow_public_status' => 0, + 'archived' => 0, + 'group_id' => 1, + 'create_date' => null, + 'user_id' => null, + ]; + + protected array $casts = [ + 'allow_public_status' => 'boolean', + 'archived' => 'boolean', + 'group_id' => 'integer', + 'default_branch_only' => 'boolean', + 'create_date' => 'datetime', + 'user_id' => 'integer', + 'overwrite_build_config' => 'boolean' ]; public static array $allowedTypes = [ @@ -66,382 +76,169 @@ class Project extends Model self::TYPE_BITBUCKET_SERVER ]; - /** - * @return int - */ - public function getId() - { - return (int)$this->data['id']; - } - - /** - * @return bool - */ - public function setId(int $value) - { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); - } - - /** - * @return string - */ - public function getTitle() + public function getTitle(): string { - return $this->data['title']; + return $this->getData('title'); } - /** - * @return bool - */ - public function setTitle(string $value) + public function setTitle(string $value): bool { - if ($this->data['title'] === $value) { - return false; - } - - $this->data['title'] = $value; - - return $this->setModified('title'); + return $this->setData('title', $value); } - /** - * @return string - */ - public function getReference() + public function getReference(): string { - return $this->data['reference']; + return $this->getData('reference'); } - /** - * @return bool - */ - public function setReference(string $value) + public function setReference(string $value): bool { - if ($this->data['reference'] === $value) { - return false; - } - - $this->data['reference'] = $value; - - return $this->setModified('reference'); + return $this->setData('reference', $value); } - /** - * @return string - */ - public function getDefaultBranch() + public function getDefaultBranch(): string { - return $this->data['default_branch']; + return $this->getData('default_branch'); } - /** - * @return bool - */ - public function setDefaultBranch(string $value) + public function setDefaultBranch(string $value): bool { - if ($this->data['default_branch'] === $value) { - return false; - } - - $this->data['default_branch'] = $value; - - return $this->setModified('default_branch'); + return $this->setData('default_branch', $value); } - /** - * @return bool - */ - public function getDefaultBranchOnly() + public function getDefaultBranchOnly(): bool { - return (bool)$this->data['default_branch_only']; + return $this->getData('default_branch_only'); } - /** - * @return bool - */ - public function setDefaultBranchOnly(bool $value) + public function setDefaultBranchOnly(bool $value): bool { - if ($this->data['default_branch_only'] === (int)$value) { - return false; - } - - $this->data['default_branch_only'] = (int)$value; - - return $this->setModified('default_branch_only'); + return $this->setData('default_branch_only', $value); } - /** - * @return string - */ - public function getSshPrivateKey() + public function getSshPrivateKey(): string { - return $this->data['ssh_private_key']; + return $this->getData('ssh_private_key'); } - /** - * @return bool - */ - public function setSshPrivateKey(?string $value) + public function setSshPrivateKey(?string $value): bool { - if ($this->data['ssh_private_key'] === $value) { - return false; - } - - $this->data['ssh_private_key'] = $value; - - return $this->setModified('ssh_private_key'); + return $this->setData('ssh_private_key', $value); } - /** - * @return string - */ - public function getSshPublicKey() + public function getSshPublicKey(): string { - return $this->data['ssh_public_key']; + return $this->getData('ssh_public_key'); } - /** - * @return bool - */ - public function setSshPublicKey(?string $value) + public function setSshPublicKey(?string $value): bool { - if ($this->data['ssh_public_key'] === $value) { - return false; - } - - $this->data['ssh_public_key'] = $value; - - return $this->setModified('ssh_public_key'); + return $this->setData('ssh_public_key', $value); } - /** - * @return string - */ - public function getType() + public function getType(): string { - return $this->data['type']; + return $this->getData('type'); } /** - * @return bool - * * @throws InvalidArgumentException */ - public function setType(string $value) + public function setType(string $value): bool { if (!\in_array($value, static::$allowedTypes, true)) { throw new InvalidArgumentException( 'Column "type" must be one of: ' . \join(', ', static::$allowedTypes) . '.' ); } - - if ($this->data['type'] === $value) { - return false; - } - - $this->data['type'] = $value; - - return $this->setModified('type'); + return $this->setData('type', $value); } /** - * @param string|null $key - * - * @return array|string|null + * @return mixed */ - public function getAccessInformation($key = null) + public function getAccessInformation(string $key = null) { - $data = \json_decode((string)$this->data['access_information'], true); - $accessInformation = null; - if (\is_null($key)) { - $accessInformation = $data; - } elseif (isset($data[$key])) { - $accessInformation = $data[$key]; + $data = $this->getData('access_information'); + if ($key === null) { + return $data; } - return $accessInformation; + return $data[$key] ?? null; } - /** - * @return bool - */ - public function setAccessInformation(array $value) + public function setAccessInformation(array $value): bool { - $accessInformation = \json_encode($value); - if ($this->data['access_information'] === $accessInformation) { - return false; - } - - $this->data['access_information'] = $accessInformation; - - return $this->setModified('access_information'); + return $this->setData('access_information', $value); } - /** - * @return string - */ - public function getBuildConfig() + public function getBuildConfig(): string { - return $this->data['build_config']; + return $this->getData('build_config'); } - /** - * @return bool - */ - public function setBuildConfig(?string $value) + public function setBuildConfig(?string $value): bool { - if ($this->data['build_config'] === $value) { - return false; - } - - $this->data['build_config'] = $value; - - return $this->setModified('build_config'); + return $this->setData('build_config', $value); } - /** - * @return bool - */ - public function getOverwriteBuildConfig() + public function getOverwriteBuildConfig(): bool { - return (bool)$this->data['overwrite_build_config']; + return $this->getData('overwrite_build_config'); } - /** - * @return bool - */ - public function setOverwriteBuildConfig(bool $value) + public function setOverwriteBuildConfig(bool $value): bool { - if ($this->data['overwrite_build_config'] === (int)$value) { - return false; - } - - $this->data['overwrite_build_config'] = (int)$value; - - return $this->setModified('overwrite_build_config'); + return $this->setData('overwrite_build_config', $value); } - /** - * @return bool - */ - public function getAllowPublicStatus() + public function getAllowPublicStatus(): bool { - return (bool)$this->data['allow_public_status']; + return $this->getData('allow_public_status'); } - /** - * @return bool - */ - public function setAllowPublicStatus(bool $value) + public function setAllowPublicStatus(bool $value): bool { - if ($this->data['allow_public_status'] === (int)$value) { - return false; - } - - $this->data['allow_public_status'] = (int)$value; - - return $this->setModified('allow_public_status'); + return $this->setData('allow_public_status', $value); } - /** - * @return bool - */ - public function getArchived() + public function getArchived(): bool { - return (bool)$this->data['archived']; + return $this->getData('archived'); } - /** - * @return bool - */ - public function setArchived(bool $value) + public function setArchived(bool $value): bool { - if ($this->data['archived'] === (int)$value) { - return false; - } - - $this->data['archived'] = (int)$value; - - return $this->setModified('archived'); + return $this->setData('archived', $value); } - /** - * @return int - */ - public function getGroupId() + public function getGroupId():int { - return (int)$this->data['group_id']; + return $this->getData('group_id'); } - /** - * @return bool - */ - public function setGroupId(int $value) + public function setGroupId(int $value): bool { - if ($this->data['group_id'] === $value) { - return false; - } - - $this->data['group_id'] = $value; - - return $this->setModified('group_id'); + return $this->setData('group_id', $value); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() + public function getCreateDate(): ?DateTime { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; + return $this->getData('create_date'); } - /** - * @return bool - */ - public function setCreateDate(DateTime $value) + public function setCreateDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); + return $this->setData('create_date', $value); } - /** - * @return int|null - */ - public function getUserId() + public function getUserId(): ?int { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; + return $this->getData('user_id'); } - /** - * @return bool - */ - public function setUserId(?int $value) + public function setUserId(?int $value): bool { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); + return $this->setData('user_id', $value); } } diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index 0862f2f42..a1dd328be 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -5,7 +5,6 @@ namespace PHPCensor\Model\Base; use DateTime; -use Exception; use PHPCensor\Model; /** @@ -17,105 +16,43 @@ class ProjectGroup extends Model { protected array $data = [ - 'id' => null, - 'title' => null, + 'id' => null, + 'title' => null, 'create_date' => null, - 'user_id' => null, + 'user_id' => null, ]; - /** - * @return int - */ - public function getId() - { - return (int)$this->data['id']; - } - - /** - * @return bool - */ - public function setId(int $value) - { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); - } + protected array $maps = [ + 'user_id' => 'int', + ]; - /** - * @return string - */ - public function getTitle() + public function getTitle(): string { - return $this->data['title']; + return $this->getData('title'); } - /** - * @return bool - */ - public function setTitle(string $value) + public function setTitle(string $value): bool { - if ($this->data['title'] === $value) { - return false; - } - - $this->data['title'] = $value; - - return $this->setModified('title'); + return $this->setData('title', $value); } - /** - * @return DateTime|null - * - * @throws Exception - */ - public function getCreateDate() + public function getCreateDate(): ?DateTime { - if ($this->data['create_date']) { - return new DateTime($this->data['create_date']); - } - - return null; + return $this->getData('create_date'); } - /** - * @return bool - */ - public function setCreateDate(DateTime $value) + public function setCreateDate(DateTime $value): bool { - $stringValue = $value->format('Y-m-d H:i:s'); - - if ($this->data['create_date'] === $stringValue) { - return false; - } - - $this->data['create_date'] = $stringValue; - - return $this->setModified('create_date'); + return $this->setData('create_date', $value); } - /** - * @return string|null - */ - public function getUserId() + public function getUserId(): ?int { - return (null !== $this->data['user_id']) ? (int)$this->data['user_id'] : null; + return $this->getData('user_id'); } - /** - * @return bool - */ - public function setUserId(?int $value) + public function setUserId(?int $value): bool { - if ($this->data['user_id'] === $value) { - return false; - } - - $this->data['user_id'] = $value; - - return $this->setModified('user_id'); + return $this->setData('user_id', $value); } } diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index ade9653fd..a7ae0cc48 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -28,236 +28,101 @@ class User extends Model 'remember_key' => null, ]; - /** - * @return int - */ - public function getId() + public function getEmail(): string { - return (int)$this->data['id']; + return $this->getData('email'); } - /** - * @return bool - */ - public function setId(int $value) + public function setEmail(string $value): bool { - if ($this->data['id'] === $value) { - return false; - } - - $this->data['id'] = $value; - - return $this->setModified('id'); + return $this->setData('email', $value); } - /** - * @return string - */ - public function getEmail() + public function getHash(): string { - return $this->data['email']; + return $this->getData('hash'); } - /** - * @return bool - */ - public function setEmail(string $value) + public function setHash(string $value): bool { - if ($this->data['email'] === $value) { - return false; - } - - $this->data['email'] = $value; - - return $this->setModified('email'); + return $this->setData('hash', $value); } - /** - * @return string - */ - public function getHash() + public function getIsAdmin(): bool { - return $this->data['hash']; + return $this->getData('is_admin'); } - /** - * @return bool - */ - public function setHash(string $value) + public function setIsAdmin(bool $value): bool { - if ($this->data['hash'] === $value) { - return false; - } - - $this->data['hash'] = $value; - - return $this->setModified('hash'); - } - - /** - * @return bool - */ - public function getIsAdmin() - { - return (bool)$this->data['is_admin']; - } - - /** - * @return bool - */ - public function setIsAdmin(bool $value) - { - if ($this->data['is_admin'] === (int)$value) { - return false; - } - - $this->data['is_admin'] = (int)$value; - - return $this->setModified('is_admin'); + return $this->setData('is_admin', $value); } - /** - * @return string - */ - public function getName() + public function getName(): string { - return $this->data['name']; + return $this->getData('name'); } - /** - * @return bool - */ - public function setName(string $value) + public function setName(string $value): bool { - if ($this->data['name'] === $value) { - return false; - } - - $this->data['name'] = $value; - - return $this->setModified('name'); + return $this->setData('name', $value); } - /** - * @return string - */ - public function getLanguage() + public function getLanguage(): string { - return $this->data['language']; + return $this->getData('language'); } - /** - * @param string $value - * - * @return bool - */ - public function setLanguage($value) + public function setLanguage(string $value): bool { - if ($this->data['language'] === $value) { - return false; - } - - $this->data['language'] = $value; - - return $this->setModified('language'); + return $this->setData('language', $value); } - /** - * @return int - */ - public function getPerPage() + public function getPerPage(): int { - return (int)$this->data['per_page']; + return $this->getData('per_page'); } - /** - * @return bool - */ - public function setPerPage(?int $value) + public function setPerPage(?int $value): bool { - if ($this->data['per_page'] === $value) { - return false; - } - - $this->data['per_page'] = $value; - - return $this->setModified('per_page'); + return $this->setData('per_page', $value); } - /** - * @return string - */ - public function getProviderKey() + public function getProviderKey(): string { - return $this->data['provider_key']; + return $this->getData('provider_key'); } - /** - * @return bool - */ - public function setProviderKey(string $value) + public function setProviderKey(string $value): bool { - if ($this->data['provider_key'] === $value) { - return false; - } - - $this->data['provider_key'] = $value; - - return $this->setModified('provider_key'); + return $this->setData('provider_key', $value); } /** - * @param string|null $key - * - * @return array|string|null + * @return mixed */ - public function getProviderData($key = null) + public function getProviderData(string $key = null) { - $data = \json_decode($this->data['provider_data'], true); - $providerData = null; - if (\is_null($key)) { - $providerData = $data; - } elseif (isset($data[$key])) { - $providerData = $data[$key]; + $data = $this->getData('provider_data'); + if ($key === null) { + return $data; } - return $providerData; + return $data[$key] ?? null; } - /** - * @return bool - */ - public function setProviderData(array $value) + public function setProviderData(array $value): bool { - $providerData = \json_encode($value); - if ($this->data['provider_data'] === $providerData) { - return false; - } - - $this->data['provider_data'] = $providerData; - - return $this->setModified('provider_data'); + return $this->setData('provider_data', $value); } - /** - * @return string - */ - public function getRememberKey() + public function getRememberKey(): string { - return $this->data['remember_key']; + return $this->getData('remember_key'); } - /** - * @return bool - */ - public function setRememberKey(?string $value) + public function setRememberKey(?string $value): bool { - if ($this->data['remember_key'] === $value) { - return false; - } - - $this->data['remember_key'] = $value; - - return $this->setModified('remember_key'); + return $this->setData('remember_key', $value); } } diff --git a/src/Model/Build.php b/src/Model/Build.php index 28947b249..4f362752e 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -81,10 +81,7 @@ public function getProject() */ public function addExtraValue($name, $value) { - $extra = \json_decode($this->data['extra'], true); - if ($extra === false) { - $extra = []; - } + $extra = $this->getExtra(); $extra[$name] = $value; $this->setExtra($extra); diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index 7159cf337..c878ed9fb 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -90,7 +90,7 @@ public function sendStatusPostback() $username = $this->configuration->get('php-censor.bitbucket.username'); $appPassword = $this->configuration->get('php-censor.bitbucket.app_password'); - if (empty($username) || empty($appPassword) || empty($this->data['id'])) { + if (empty($username) || empty($appPassword) || empty($this->getId())) { return false; } diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 205107500..e9d6d7a74 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -101,7 +101,7 @@ public function sendStatusPostback() } $token = $this->configuration->get('php-censor.github.token'); - if (empty($token) || empty($this->data['id'])) { + if (empty($token) || empty($this->getId())) { return false; } From 5f924e8179bb76eecd2dbe3f59b8a954ab916a67 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:00:25 +0000 Subject: [PATCH 048/212] Model get int nullable --- src/Model.php | 2 +- src/Model/Base/Build.php | 6 +++--- src/Model/Base/BuildError.php | 8 ++++---- src/Model/Base/Environment.php | 2 +- src/Model/Base/User.php | 2 +- src/Model/User.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Model.php b/src/Model.php index 46be16eaa..375a6d0eb 100644 --- a/src/Model.php +++ b/src/Model.php @@ -110,7 +110,7 @@ private function cast($type, $value) /** * @return int */ - public function getId(): int + public function getId(): ?int { return $this->getData('id'); } diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 35544a382..74c37427c 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -97,7 +97,7 @@ class Build extends Model self::SOURCE_WEBHOOK_PULL_REQUEST_MERGED, ]; - public function getParentId(): int + public function getParentId(): ?int { return $this->getData('parent_id'); } @@ -107,7 +107,7 @@ public function setParentId(?int $value): bool return $this->setData('parent_id', $value); } - public function getProjectId(): int + public function getProjectId(): ?int { return $this->getData('project_id'); } @@ -127,7 +127,7 @@ public function setCommitId(string $value): bool return $this->setData('commit_id', $value); } - public function getStatus(): int + public function getStatus(): ?int { return $this->getData('status'); } diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index 134083c87..9f1823192 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -44,7 +44,7 @@ class BuildError extends Model 'is_new' => 'boolean' ]; - public function getBuildId(): int + public function getBuildId(): ?int { return $this->getData('build_id'); } @@ -74,7 +74,7 @@ public function setFile(?string $value): bool return $this->setData('file', $value); } - public function getLineStart(): int + public function getLineStart(): ?int { return $this->getData('line_start'); } @@ -84,7 +84,7 @@ public function setLineStart(?int $value): bool return $this->setData('line_start', $value); } - public function getLineEnd(): int + public function getLineEnd(): ?int { return $this->getData('line_end'); } @@ -94,7 +94,7 @@ public function setLineEnd(?int $value): bool return $this->setData('line_end', $value); } - public function getSeverity(): int + public function getSeverity(): ?int { return $this->getData('severity'); } diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index 73d670726..4b092b080 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -26,7 +26,7 @@ class Environment extends Model 'branches' => 'array', ]; - public function getProjectId(): int + public function getProjectId(): ?int { return $this->getData('project_id'); } diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index a7ae0cc48..5fc5ac1a9 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -78,7 +78,7 @@ public function setLanguage(string $value): bool return $this->setData('language', $value); } - public function getPerPage(): int + public function getPerPage(): ?int { return $this->getData('per_page'); } diff --git a/src/Model/User.php b/src/Model/User.php index 22a5c8da8..116e6ce7f 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -14,7 +14,7 @@ */ class User extends BaseUser { - public function getFinalPerPage(ConfigurationInterface $configuration): int + public function getFinalPerPage(ConfigurationInterface $configuration): ?int { $perPage = $this->getPerPage(); if ($perPage) { From e98cdfc64444603d962b847c2776d8dd791cb518 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:03:36 +0000 Subject: [PATCH 049/212] String must be nullable --- src/Model/Base/Build.php | 8 ++++---- src/Model/Base/BuildError.php | 8 ++++---- src/Model/Base/BuildMeta.php | 4 ++-- src/Model/Base/Environment.php | 2 +- src/Model/Base/Project.php | 14 +++++++------- src/Model/Base/ProjectGroup.php | 2 +- src/Model/Base/User.php | 14 +++++++------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 74c37427c..64a02410a 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -117,7 +117,7 @@ public function setProjectId(int $value): bool return $this->setData('project_id', $value); } - public function getCommitId(): string + public function getCommitId(): ?string { return $this->getData('commit_id'); } @@ -166,7 +166,7 @@ public function setStatusFailed(): bool return $this->setData('status', self::STATUS_FAILED); } - public function getLog(): string + public function getLog(): ?string { return $this->getData('log'); } @@ -176,7 +176,7 @@ public function setLog(?string $value): bool return $this->setData('log', $value); } - public function getBranch(): string + public function getBranch(): ?string { return $this->getData('branch'); } @@ -186,7 +186,7 @@ public function setBranch(string $value) return $this->setData('branch', $value); } - public function getTag(): string + public function getTag(): ?string { return $this->getData('tag'); } diff --git a/src/Model/Base/BuildError.php b/src/Model/Base/BuildError.php index 9f1823192..cc7af2f90 100644 --- a/src/Model/Base/BuildError.php +++ b/src/Model/Base/BuildError.php @@ -54,7 +54,7 @@ public function setBuildId(int $value): bool return $this->setData('build_id', $value); } - public function getPlugin(): string + public function getPlugin(): ?string { return $this->getData('plugin'); } @@ -64,7 +64,7 @@ public function setPlugin(string $value): bool return $this->setData('plugin', $value); } - public function getFile(): string + public function getFile(): ?string { return $this->getData('file'); } @@ -104,7 +104,7 @@ public function setSeverity(int $value): bool return $this->setData('severity', $value); } - public function getMessage(): string + public function getMessage(): ?string { return $this->getData('message'); } @@ -124,7 +124,7 @@ public function setCreateDate(DateTime $value): bool return $this->setData('create_date', $value); } - public function getHash(): string + public function getHash(): ?string { return $this->getData('hash'); } diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 3f30189e3..48d587e60 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -36,7 +36,7 @@ public function setBuildId(int $value): bool return $this->setData('build_id', $value); } - public function getMetaKey(): string + public function getMetaKey(): ?string { return $this->getData('meta_key'); } @@ -46,7 +46,7 @@ public function setMetaKey(string $value): bool return $this->setData('meta_key', $value); } - public function getMetaValue(): string + public function getMetaValue(): ?string { return $this->getData('meta_value'); } diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index 4b092b080..fdc4d11ab 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -36,7 +36,7 @@ public function setProjectId(int $value): bool return $this->setData('project_id', $value); } - public function getName(): string + public function getName(): ?string { return $this->getData('name'); } diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index eff68029c..e72c13c1a 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -76,7 +76,7 @@ class Project extends Model self::TYPE_BITBUCKET_SERVER ]; - public function getTitle(): string + public function getTitle(): ?string { return $this->getData('title'); } @@ -86,7 +86,7 @@ public function setTitle(string $value): bool return $this->setData('title', $value); } - public function getReference(): string + public function getReference(): ?string { return $this->getData('reference'); } @@ -96,7 +96,7 @@ public function setReference(string $value): bool return $this->setData('reference', $value); } - public function getDefaultBranch(): string + public function getDefaultBranch(): ?string { return $this->getData('default_branch'); } @@ -116,7 +116,7 @@ public function setDefaultBranchOnly(bool $value): bool return $this->setData('default_branch_only', $value); } - public function getSshPrivateKey(): string + public function getSshPrivateKey(): ?string { return $this->getData('ssh_private_key'); } @@ -126,7 +126,7 @@ public function setSshPrivateKey(?string $value): bool return $this->setData('ssh_private_key', $value); } - public function getSshPublicKey(): string + public function getSshPublicKey(): ?string { return $this->getData('ssh_public_key'); } @@ -136,7 +136,7 @@ public function setSshPublicKey(?string $value): bool return $this->setData('ssh_public_key', $value); } - public function getType(): string + public function getType(): ?string { return $this->getData('type'); } @@ -172,7 +172,7 @@ public function setAccessInformation(array $value): bool return $this->setData('access_information', $value); } - public function getBuildConfig(): string + public function getBuildConfig(): ?string { return $this->getData('build_config'); } diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index a1dd328be..4c1ba58ce 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -26,7 +26,7 @@ class ProjectGroup extends Model 'user_id' => 'int', ]; - public function getTitle(): string + public function getTitle(): ?string { return $this->getData('title'); } diff --git a/src/Model/Base/User.php b/src/Model/Base/User.php index 5fc5ac1a9..5513359c7 100644 --- a/src/Model/Base/User.php +++ b/src/Model/Base/User.php @@ -28,7 +28,7 @@ class User extends Model 'remember_key' => null, ]; - public function getEmail(): string + public function getEmail(): ?string { return $this->getData('email'); } @@ -38,7 +38,7 @@ public function setEmail(string $value): bool return $this->setData('email', $value); } - public function getHash(): string + public function getHash(): ?string { return $this->getData('hash'); } @@ -58,7 +58,7 @@ public function setIsAdmin(bool $value): bool return $this->setData('is_admin', $value); } - public function getName(): string + public function getName(): ?string { return $this->getData('name'); } @@ -68,12 +68,12 @@ public function setName(string $value): bool return $this->setData('name', $value); } - public function getLanguage(): string + public function getLanguage(): ?string { return $this->getData('language'); } - public function setLanguage(string $value): bool + public function setLanguage(?string $value): bool { return $this->setData('language', $value); } @@ -88,7 +88,7 @@ public function setPerPage(?int $value): bool return $this->setData('per_page', $value); } - public function getProviderKey(): string + public function getProviderKey(): ?string { return $this->getData('provider_key'); } @@ -116,7 +116,7 @@ public function setProviderData(array $value): bool return $this->setData('provider_data', $value); } - public function getRememberKey(): string + public function getRememberKey(): ?string { return $this->getData('remember_key'); } From 1aff84a9ea0af0c628b0ae6c05e49741154a9988 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:13:07 +0000 Subject: [PATCH 050/212] Fix casting on set value --- src/Model.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Model.php b/src/Model.php index 375a6d0eb..7d9cdbb5f 100644 --- a/src/Model.php +++ b/src/Model.php @@ -51,14 +51,24 @@ protected function getData(string $column, $defaultValue = null) protected function setData(string $column, $value): bool { - if ($this->data[$column] === $value) { - return false; + $stringValue = $value; + + if (!is_null($value)) { + switch ($this->casts[$column] ?? 'string') { + case 'datetime': + $stringValue = $value->format('Y-m-d H:i:s'); + break; + case 'array': + $stringValue = json_encode($value); + break; + } } - // date time - // $stringValue = $value->format('Y-m-d H:i:s'); + if ($this->data[$column] === $stringValue) { + return false; + } - $this->data[$column] = $value; + $this->data[$column] = $stringValue; $this->modified[$column] = $column; return true; From a013abf1d7176c061139a9b2674c13793c10502f Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:21:36 +0000 Subject: [PATCH 051/212] Fix censor issues --- src/Model.php | 10 ++++++++-- src/Model/Base/Build.php | 2 +- src/Store/BuildStore.php | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Model.php b/src/Model.php index 7d9cdbb5f..d9b061c27 100644 --- a/src/Model.php +++ b/src/Model.php @@ -84,9 +84,15 @@ public function getModified(): array return $this->modified; } - private function cast($type, $value) + /** + * @return mixed + */ + private function cast(string $type, ?string $value) { - if (is_null($value)) { + if ($value === null) { + if ($type == 'array') { + return []; + } return null; } diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 64a02410a..ab99dc0b8 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -51,7 +51,7 @@ class Build extends Model 'finish_date' => null, 'committer_email' => null, 'commit_message' => null, - 'extra' => [], + 'extra' => null, 'environment_id' => null, 'source' => Build::SOURCE_UNKNOWN, 'user_id' => null, diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 7dd766666..485aa1142 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -346,7 +346,7 @@ public function getBuildBranches(int $projectId): array /** * Return build metadata by key, project and optionally build id. */ - public function getMeta(string $key, int $projectId, ?int $buildId = null, ?string $branch = null, int $numResults = 1): ?array + public function getMeta(string $key, ?int $projectId, ?int $buildId = null, ?string $branch = null, int $numResults = 1): ?array { $query = 'SELECT bm.build_id, bm.meta_key, bm.meta_value FROM {{build_metas}} AS {{bm}} @@ -370,9 +370,9 @@ public function getMeta(string $key, int $projectId, ?int $buildId = null, ?stri $stmt = $this->databaseManager->getConnection('read')->prepare($query); $stmt->bindValue(':key', $key, PDO::PARAM_STR); - $stmt->bindValue(':projectId', (int)$projectId, PDO::PARAM_INT); - $stmt->bindValue(':buildId', (int)$buildId, PDO::PARAM_INT); - $stmt->bindValue(':numResults', (int)$numResults, PDO::PARAM_INT); + $stmt->bindValue(':projectId', $projectId, PDO::PARAM_INT); + $stmt->bindValue(':buildId', $buildId, PDO::PARAM_INT); + $stmt->bindValue(':numResults', $numResults, PDO::PARAM_INT); if (!\is_null($branch)) { $stmt->bindValue(':branch', $branch, PDO::PARAM_STR); From 1c31631d69890901b0b1d34efe0b91a1f155bf76 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:27:09 +0000 Subject: [PATCH 052/212] Fix array defaults --- src/Model.php | 11 +++++------ src/Model/Base/Build.php | 2 +- src/Model/Base/BuildMeta.php | 2 +- src/Model/Base/Environment.php | 2 +- src/Model/Base/ProjectGroup.php | 4 ++-- src/Model/Build.php | 17 ++++++++++------- tests/src/Model/Base/BuildTest.php | 2 +- tests/src/Model/Base/EnvironmentTest.php | 2 +- tests/src/Model/BuildTest.php | 2 +- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Model.php b/src/Model.php index d9b061c27..ad14d4a87 100644 --- a/src/Model.php +++ b/src/Model.php @@ -87,21 +87,20 @@ public function getModified(): array /** * @return mixed */ - private function cast(string $type, ?string $value) + private function cast(string $type, $value) { if ($value === null) { - if ($type == 'array') { - return []; - } return null; } + if (gettype($value) === $type) { + return $value; + } + switch ($type) { case 'integer': - case 'int': return intval($value); - case 'bool': case 'boolean': return boolval($value); diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index ab99dc0b8..64a02410a 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -51,7 +51,7 @@ class Build extends Model 'finish_date' => null, 'committer_email' => null, 'commit_message' => null, - 'extra' => null, + 'extra' => [], 'environment_id' => null, 'source' => Build::SOURCE_UNKNOWN, 'user_id' => null, diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index 48d587e60..c0b942a1f 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -23,7 +23,7 @@ class BuildMeta extends Model ]; protected array $casts = [ - 'build_id' => 'int', + 'build_id' => 'integer', ]; public function getBuildId():int diff --git a/src/Model/Base/Environment.php b/src/Model/Base/Environment.php index fdc4d11ab..5a1a9cb34 100644 --- a/src/Model/Base/Environment.php +++ b/src/Model/Base/Environment.php @@ -22,7 +22,7 @@ class Environment extends Model ]; protected array $casts = [ - 'project_id' => 'int', + 'project_id' => 'integer', 'branches' => 'array', ]; diff --git a/src/Model/Base/ProjectGroup.php b/src/Model/Base/ProjectGroup.php index 4c1ba58ce..12cafd34a 100644 --- a/src/Model/Base/ProjectGroup.php +++ b/src/Model/Base/ProjectGroup.php @@ -22,8 +22,8 @@ class ProjectGroup extends Model 'user_id' => null, ]; - protected array $maps = [ - 'user_id' => 'int', + protected array $casts = [ + 'user_id' => 'integer', ]; public function getTitle(): ?string diff --git a/src/Model/Build.php b/src/Model/Build.php index 4f362752e..a64732e1f 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -76,28 +76,31 @@ public function getProject() } /** - * @param string $name * @param mixed $value */ - public function addExtraValue($name, $value) + public function addExtraValue(string $name, $value): bool { $extra = $this->getExtra(); + if ($extra === null) { + $extra = []; + } $extra[$name] = $value; - $this->setExtra($extra); + return $this->setExtra($extra); } /** * @param string $name */ - public function removeExtraValue($name) + public function removeExtraValue(string $name): bool { $extra = $this->getExtra(); - if (!empty($extra[$name])) { - unset($extra[$name]); + if ($extra === null || array_key_exists($name, $extra)) { + return false; } - $this->setExtra($extra); + unset($extra[$name]); + return $this->setExtra($extra); } /** diff --git a/tests/src/Model/Base/BuildTest.php b/tests/src/Model/Base/BuildTest.php index cc2931c72..148161bb5 100644 --- a/tests/src/Model/Base/BuildTest.php +++ b/tests/src/Model/Base/BuildTest.php @@ -46,7 +46,7 @@ public function testConstruct() 'finish_date' => null, 'committer_email' => null, 'commit_message' => null, - 'extra' => null, + 'extra' => [], 'environment_id' => null, 'source' => Build::SOURCE_UNKNOWN, 'user_id' => null, diff --git a/tests/src/Model/Base/EnvironmentTest.php b/tests/src/Model/Base/EnvironmentTest.php index 9814b34d4..3554854c8 100644 --- a/tests/src/Model/Base/EnvironmentTest.php +++ b/tests/src/Model/Base/EnvironmentTest.php @@ -34,7 +34,7 @@ public function testConstruct() 'id' => null, 'project_id' => null, 'name' => null, - 'branches' => null, + 'branches' => [], ], $environment->getDataArray()); } diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index b846a249c..372ba902f 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -57,7 +57,7 @@ public function testConstruct() 'finish_date' => null, 'committer_email' => null, 'commit_message' => null, - 'extra' => null, + 'extra' => [], 'environment_id' => null, 'source' => Build::SOURCE_UNKNOWN, 'user_id' => null, From 7ef340cc8bd06dd0f1ccef8ff4e7cad4bbafa893 Mon Sep 17 00:00:00 2001 From: Kieran Date: Fri, 11 Feb 2022 23:45:34 +0000 Subject: [PATCH 053/212] Force getId to always are turn an int --- tests/src/Helper/BuildInterpolatorTest.php | 5 ++++- tests/src/Logging/BuildLoggerTest.php | 8 +++++++- tests/src/Plugin/Util/ExecutorTest.php | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/src/Helper/BuildInterpolatorTest.php b/tests/src/Helper/BuildInterpolatorTest.php index c32c4ae75..18c9617e1 100644 --- a/tests/src/Helper/BuildInterpolatorTest.php +++ b/tests/src/Helper/BuildInterpolatorTest.php @@ -44,7 +44,10 @@ public function testInterpolate_LeavesStringsUnchangedByDefault() public function testInterpolate_LeavesStringsUnchangedWhenBuildIsSet() { - $build = $this->prophesize('PHPCensor\\Model\\Build')->reveal(); + $mockRegistry = $this->prophesize('\PHPCensor\StoreRegistry'); + $build = $this->prophesize('PHPCensor\\Model\\Build') + ->willBeConstructedWith([$mockRegistry->reveal(), ['id' => 1]]) + ->reveal(); $string = "Hello World"; $expectedOutput = "Hello World"; diff --git a/tests/src/Logging/BuildLoggerTest.php b/tests/src/Logging/BuildLoggerTest.php index 8eeaa79aa..cb4aafa55 100644 --- a/tests/src/Logging/BuildLoggerTest.php +++ b/tests/src/Logging/BuildLoggerTest.php @@ -4,6 +4,8 @@ use Exception; use PHPCensor\Logging\BuildLogger; +use PHPCensor\Model\Build; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; @@ -22,11 +24,15 @@ class BuildLoggerTest extends TestCase protected $mockBuild; + protected $mockRegistry; + protected function setUp(): void { parent::setUp(); $this->mockLogger = $this->prophesize('\Psr\Log\LoggerInterface'); - $this->mockBuild = $this->prophesize('\PHPCensor\Model\Build'); + $this->mockRegistry = $this->prophesize('\PHPCensor\StoreRegistry'); + $this->mockBuild = $this->prophesize('\PHPCensor\Model\Build') + ->willBeConstructedWith([$this->mockRegistry->reveal(), ['id' => 1]]); $this->testedBuildLogger = new BuildLogger( $this->mockLogger->reveal(), diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index 336f819a2..d252004cf 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -154,7 +154,7 @@ public function testExecutePlugins_CallsEachPluginForStage() { $phpUnitPluginOptions = []; $behatPluginOptions = []; - $build = new Build($this->storeRegistry); + $build = new Build($this->storeRegistry, ['id' => 1]); $config = [ 'stageOne' => [ From 84f0c97c29f91c5ccdc118733bf49db01e3c3792 Mon Sep 17 00:00:00 2001 From: Kieran Date: Sat, 12 Feb 2022 00:19:57 +0000 Subject: [PATCH 054/212] PHP Coding Standards --- src/Model.php | 8 -------- src/Model/Base/Build.php | 3 --- src/Model/Base/BuildMeta.php | 2 +- src/Model/Base/Project.php | 3 ++- src/Model/Build.php | 5 +---- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/Model.php b/src/Model.php index ad14d4a87..d694da17c 100644 --- a/src/Model.php +++ b/src/Model.php @@ -28,7 +28,6 @@ public function __construct( StoreRegistry $storeRegistry, array $initialData = [] ) { - if (!isset($this->casts['id'])) { $this->casts['id'] = 'integer'; } @@ -122,18 +121,11 @@ private function cast(string $type, $value) } } - /** - * @return int - */ public function getId(): ?int { return $this->getData('id'); } - /** - * @param int $value - * @return bool - */ public function setId(int $value): bool { return $this->setData('id', $value); diff --git a/src/Model/Base/Build.php b/src/Model/Base/Build.php index 64a02410a..d585e96bf 100644 --- a/src/Model/Base/Build.php +++ b/src/Model/Base/Build.php @@ -352,9 +352,6 @@ public function getErrorsTotalPrevious(): ?int return $this->getData('errors_total_previous'); } - /** - * @return bool - */ public function setErrorsTotalPrevious(int $value): bool { return $this->setData('errors_total_previous', $value); diff --git a/src/Model/Base/BuildMeta.php b/src/Model/Base/BuildMeta.php index c0b942a1f..aec069bbb 100644 --- a/src/Model/Base/BuildMeta.php +++ b/src/Model/Base/BuildMeta.php @@ -26,7 +26,7 @@ class BuildMeta extends Model 'build_id' => 'integer', ]; - public function getBuildId():int + public function getBuildId(): int { return $this->getData('build_id'); } diff --git a/src/Model/Base/Project.php b/src/Model/Base/Project.php index e72c13c1a..fc8a90457 100644 --- a/src/Model/Base/Project.php +++ b/src/Model/Base/Project.php @@ -151,6 +151,7 @@ public function setType(string $value): bool 'Column "type" must be one of: ' . \join(', ', static::$allowedTypes) . '.' ); } + return $this->setData('type', $value); } @@ -212,7 +213,7 @@ public function setArchived(bool $value): bool return $this->setData('archived', $value); } - public function getGroupId():int + public function getGroupId(): int { return $this->getData('group_id'); } diff --git a/src/Model/Build.php b/src/Model/Build.php index a64732e1f..175d28225 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -89,17 +89,14 @@ public function addExtraValue(string $name, $value): bool return $this->setExtra($extra); } - /** - * @param string $name - */ public function removeExtraValue(string $name): bool { $extra = $this->getExtra(); if ($extra === null || array_key_exists($name, $extra)) { return false; } - unset($extra[$name]); + return $this->setExtra($extra); } From 3b9629c259dbe3119369c922bf3af9812a35db6f Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 12 Feb 2022 23:57:18 +0700 Subject: [PATCH 055/212] Fixed codecov config. --- codecov.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index d7543c1ac..2797a62a7 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,9 @@ coverage: round: nearest - precision: 0 + precision: 2 + +github_checks: + annotations: false comment: false From 2737370455031ccd948347478744477e204b4ec8 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 13 Feb 2022 00:42:23 +0700 Subject: [PATCH 056/212] UI fixes. --- bootstrap.php | 1 + public/assets/css/main.css | 14 ++++++++++++++ public/assets/js/app.js | 6 ++++-- public/assets/js/build.js | 4 ++-- public/assets/js/dashboard-widgets/all_projects.js | 4 +++- public/assets/js/dashboard-widgets/build_errors.js | 4 +++- public/assets/js/dashboard-widgets/last_builds.js | 4 +++- src/View/Project/ajax-builds.phtml | 4 ++-- src/View/WidgetAllProjects/index-projects.phtml | 9 +++++---- src/View/WidgetAllProjects/update.phtml | 9 +++++---- src/View/WidgetBuildErrors/update.phtml | 8 ++++---- src/View/WidgetLastBuilds/index.phtml | 5 +++++ src/View/WidgetLastBuilds/update.phtml | 4 ++-- src/View/layout.phtml | 1 + 14 files changed, 54 insertions(+), 23 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 34dbee7cf..d0cc4d0bb 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -19,5 +19,6 @@ $storeRegistry = new StoreRegistry($databaseManager); \define('APP_URL', $configuration->get('php-censor.url', '') . '/'); +\define('REALTIME_UI', false); Lang::init($configuration, $storeRegistry); diff --git a/public/assets/css/main.css b/public/assets/css/main.css index d798b1c20..68d5e6ad6 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -650,3 +650,17 @@ h6, max-height: 1000%; overflow: auto; } + +.blink-item { + animation: blink 1s linear infinite; +} + +@keyframes blink { + 0% {opacity: 0;} + 50% {opacity: 0.5;} + 100% {opacity: 1;} +} + +body .box .small-box h3.dashboard-box-title { + font-size: 28px; +} diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 67ffde7ad..4893351c0 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -6,10 +6,12 @@ var PHPCensor = { $(document).ready(function () { // Update latest builds every 5 seconds: PHPCensor.getBuilds(); - PHPCensor.intervals.getBuilds = setInterval(PHPCensor.getBuilds, 5000); + if (REALTIME_UI) { + PHPCensor.intervals.getBuilds = setInterval(PHPCensor.getBuilds, 5000); + } // Update latest project builds every 10 seconds: - if (typeof PROJECT_ID != 'undefined') { + if (REALTIME_UI && typeof PROJECT_ID != 'undefined') { PHPCensor.intervals.getProjectBuilds = setInterval(PHPCensor.getProjectBuilds, 10000); } }); diff --git a/public/assets/js/build.js b/public/assets/js/build.js index f9c17b149..dcd585bdb 100644 --- a/public/assets/js/build.js +++ b/public/assets/js/build.js @@ -72,7 +72,7 @@ var Build = Class.extend({ var cb = function () { var fullUri = window.APP_URL + uri; - if (name == 'build-updated') { + if (name === 'build-updated') { fullUri = window.APP_URL + 'build/ajax-data/' + self.buildId + '?per_page=' + PER_PAGE + '&page=' + PAGE + '&plugin=' + BUILD_PLUGIN + '&severity=' + BUILD_SEVERITY + '&is_new=' + BUILD_IS_NEW; } @@ -87,7 +87,7 @@ var Build = Class.extend({ }); }; - if (seconds != -1) { + if (REALTIME_UI && seconds !== -1) { self.queries[name] = setInterval(cb, seconds * 1000); } diff --git a/public/assets/js/dashboard-widgets/all_projects.js b/public/assets/js/dashboard-widgets/all_projects.js index 14af6bf6b..15f9ca01f 100644 --- a/public/assets/js/dashboard-widgets/all_projects.js +++ b/public/assets/js/dashboard-widgets/all_projects.js @@ -13,7 +13,9 @@ PHPCensor.widgets.allProjects = { success: function (data) { $(('#widget-all_projects-container')).html(data); - PHPCensor.widgets.allProjects.interval = setInterval(PHPCensor.widgets.allProjects.update, 10000); + if (REALTIME_UI) { + PHPCensor.widgets.allProjects.interval = setInterval(PHPCensor.widgets.allProjects.update, 10000); + } }, error: PHPCensor.handleFailedAjax diff --git a/public/assets/js/dashboard-widgets/build_errors.js b/public/assets/js/dashboard-widgets/build_errors.js index b4b070d06..7ba7f675f 100644 --- a/public/assets/js/dashboard-widgets/build_errors.js +++ b/public/assets/js/dashboard-widgets/build_errors.js @@ -13,7 +13,9 @@ PHPCensor.widgets.buildErrors = { success: function (data) { $(('#widget-build_errors-container')).html(data); - PHPCensor.widgets.buildErrors.interval = setInterval(PHPCensor.widgets.buildErrors.update, 10000); + if (REALTIME_UI) { + PHPCensor.widgets.buildErrors.interval = setInterval(PHPCensor.widgets.buildErrors.update, 10000); + } }, error: PHPCensor.handleFailedAjax diff --git a/public/assets/js/dashboard-widgets/last_builds.js b/public/assets/js/dashboard-widgets/last_builds.js index b064fb708..924a0f0f8 100644 --- a/public/assets/js/dashboard-widgets/last_builds.js +++ b/public/assets/js/dashboard-widgets/last_builds.js @@ -13,7 +13,9 @@ PHPCensor.widgets.lastBuilds = { success: function (data) { $(('#widget-last_builds-container')).html(data); - PHPCensor.widgets.lastBuilds.interval = setInterval(PHPCensor.widgets.lastBuilds.update, 10000); + if (REALTIME_UI) { + PHPCensor.widgets.lastBuilds.interval = setInterval(PHPCensor.widgets.lastBuilds.update, 10000); + } }, error: PHPCensor.handleFailedAjax diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml index ba26d448a..b335e6347 100644 --- a/src/View/Project/ajax-builds.phtml +++ b/src/View/Project/ajax-builds.phtml @@ -25,14 +25,14 @@ use PHPCensor\Store\EnvironmentStore; switch ($build->getStatus()) { case 0: $cls = 'active'; - $subClass = 'info'; + $subClass = 'info blink-item'; $status = Lang::get('pending'); break; case 1: $cls = 'warning'; - $subClass = 'warning'; + $subClass = 'warning blink-item'; $status = Lang::get('running'); break; diff --git a/src/View/WidgetAllProjects/index-projects.phtml b/src/View/WidgetAllProjects/index-projects.phtml index 6200c9240..55ea5dc39 100644 --- a/src/View/WidgetAllProjects/index-projects.phtml +++ b/src/View/WidgetAllProjects/index-projects.phtml @@ -87,11 +87,11 @@ foreach ($projects as $project): } ?> -
          +
          -

          +

          getTitle(); ?> @@ -127,11 +127,11 @@ foreach ($projects as $project): switch ($build->getStatus()) { case Build::STATUS_PENDING: $class = 'bg-blue'; - $icon = 'fa-clock-o'; + $icon = 'fa-clock-o blink-item'; break; case BUild::STATUS_RUNNING: $class = 'bg-yellow'; - $icon = 'fa-cogs'; + $icon = 'fa-cogs blink-item'; break; case Build::STATUS_SUCCESS: $class = 'bg-green'; @@ -142,6 +142,7 @@ foreach ($projects as $project): $icon = 'fa-times'; break; } + echo ''; } } diff --git a/src/View/WidgetAllProjects/update.phtml b/src/View/WidgetAllProjects/update.phtml index cb134856c..8dbac45ad 100644 --- a/src/View/WidgetAllProjects/update.phtml +++ b/src/View/WidgetAllProjects/update.phtml @@ -85,7 +85,7 @@ if ($buildCount > 0) {
          -

          +

          getTitle(); ?> @@ -108,7 +108,7 @@ if ($buildCount > 0) {

          () - +
          0) { switch ($build->getStatus()) { case Build::STATUS_PENDING: $class = 'bg-blue'; - $icon = 'fa-clock-o'; + $icon = 'fa-clock-o blink-item'; break; case Build::STATUS_RUNNING: $class = 'bg-yellow'; - $icon = 'fa-cogs'; + $icon = 'fa-cogs blink-item'; break; case Build::STATUS_SUCCESS: $class = 'bg-green'; @@ -134,6 +134,7 @@ if ($buildCount > 0) { $icon = 'fa-times'; break; } + echo ''; } } ?> diff --git a/src/View/WidgetBuildErrors/update.phtml b/src/View/WidgetBuildErrors/update.phtml index cf1bad1ce..9af655833 100644 --- a/src/View/WidgetBuildErrors/update.phtml +++ b/src/View/WidgetBuildErrors/update.phtml @@ -87,11 +87,11 @@ foreach ($builds as $projectId => $projectEnvs): } ?> -
          +
          -

          +

          getTitle(); ?> @@ -128,11 +128,11 @@ foreach ($builds as $projectId => $projectEnvs): switch ($build->getStatus()) { case Build::STATUS_PENDING: $class = 'bg-blue'; - $icon = 'fa-clock-o'; + $icon = 'fa-clock-o blink-item'; break; case Build::STATUS_RUNNING: $class = 'bg-yellow'; - $icon = 'fa-cogs'; + $icon = 'fa-cogs blink-item'; break; case Build::STATUS_SUCCESS: $class = 'bg-green'; diff --git a/src/View/WidgetLastBuilds/index.phtml b/src/View/WidgetLastBuilds/index.phtml index 4da541e83..1a371ffa3 100644 --- a/src/View/WidgetLastBuilds/index.phtml +++ b/src/View/WidgetLastBuilds/index.phtml @@ -6,6 +6,11 @@ use PHPCensor\Helper\Lang;

          +
          + +
          diff --git a/src/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml index b56dad556..752dd28f8 100644 --- a/src/View/WidgetLastBuilds/update.phtml +++ b/src/View/WidgetLastBuilds/update.phtml @@ -31,13 +31,13 @@ use PHPCensor\Store\EnvironmentStore; case Build::STATUS_PENDING: $updated = $build->getCreateDate(); $label = Lang::get('pending'); - $color = 'blue'; + $color = 'blue blink-item'; break; case Build::STATUS_RUNNING: $updated = $build->getStartDate(); $label = Lang::get('running'); - $color = 'yellow'; + $color = 'yellow blink-item'; break; case Build::STATUS_SUCCESS: diff --git a/src/View/layout.phtml b/src/View/layout.phtml index b0022442b..f356f494a 100644 --- a/src/View/layout.phtml +++ b/src/View/layout.phtml @@ -43,6 +43,7 @@ use PHPCensor\Model\User; ' . PHP_EOL; - } + print '' . PHP_EOL; +} ?> diff --git a/src/View/layout.phtml b/src/View/layout.phtml index 835065732..a178d7103 100644 --- a/src/View/layout.phtml +++ b/src/View/layout.phtml @@ -177,6 +177,11 @@ use PHPCensor\Model\User; +
        • + + + +
        • diff --git a/tests/src/BuilderTest.php b/tests/src/BuilderTest.php index 51e144420..813dea4b7 100644 --- a/tests/src/BuilderTest.php +++ b/tests/src/BuilderTest.php @@ -43,20 +43,7 @@ protected function setUp(): void ->setConstructorArgs([$configuration]) ->getMock(); - $storeRegistry = $this - ->getMockBuilder(StoreRegistry::class) - ->setConstructorArgs([$databaseManager]) - ->getMock(); - - $buildStore = $this - ->getMockBuilder(BuildStore::class) - ->setConstructorArgs([$databaseManager, $storeRegistry]) - ->getMock(); - - $storeRegistry - ->method('get') - ->with('Build') - ->willReturn($buildStore); + $storeRegistry = new StoreRegistry($databaseManager); $project = $this ->getMockBuilder(Project::class) diff --git a/tests/src/Helper/BuildInterpolatorTest.php b/tests/src/Helper/BuildInterpolatorTest.php index c9b733e54..a379e101d 100644 --- a/tests/src/Helper/BuildInterpolatorTest.php +++ b/tests/src/Helper/BuildInterpolatorTest.php @@ -6,6 +6,8 @@ use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; +use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; @@ -33,7 +35,17 @@ protected function setUp(): void ->setConstructorArgs([$databaseManager]) ->getMock(); - $this->testedInterpolator = new BuildInterpolator($this->storeRegistry); + $secretStore = $this + ->getMockBuilder(SecretStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $environmentStore = $this + ->getMockBuilder(EnvironmentStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $this->testedInterpolator = new BuildInterpolator($environmentStore, $secretStore); } public function testInterpolate_LeavesStringsUnchangedByDefault(): void diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index b75a2d109..3c86b370e 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -10,6 +10,8 @@ use PHPCensor\Model\Project; use PHPCensor\Plugin; use PHPCensor\Plugin\EmailNotify as EmailPlugin; +use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use PHPCensor\Common\Application\ConfigurationInterface; @@ -91,7 +93,18 @@ protected function setUp(): void $this->builder->buildPath = "/"; - $interpolator = new BuildInterpolator($this->storeRegistry); + $secretStore = $this + ->getMockBuilder(SecretStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $environmentStore = $this + ->getMockBuilder(EnvironmentStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $interpolator = new BuildInterpolator($environmentStore, $secretStore); + $this->builder->expects($this->any()) ->method('interpolate') ->will($this->returnCallback(function () use ($self, $interpolator) { diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index d2e9e4452..405592503 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -12,6 +12,8 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin\PhpUnit; use PHPCensor\Store\BuildStore; +use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\MockObject\MockBuilder; use PHPUnit\Framework\TestCase; @@ -64,20 +66,8 @@ protected function getPluginBuilder(array $options = []): MockBuilder ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); - $storeRegistry = $this - ->getMockBuilder(StoreRegistry::class) - ->setConstructorArgs([$databaseManager]) - ->getMock(); - - $buildStore = $this - ->getMockBuilder(BuildStore::class) - ->setConstructorArgs([$databaseManager, $storeRegistry]) - ->getMock(); - $storeRegistry - ->method('get') - ->with('Build') - ->willReturn($buildStore); + $storeRegistry = new StoreRegistry($databaseManager); $build = $this ->getMockBuilder(Build::class) diff --git a/tests/src/PluginTest.php b/tests/src/PluginTest.php index 2ec044d8f..ac9d36695 100644 --- a/tests/src/PluginTest.php +++ b/tests/src/PluginTest.php @@ -9,6 +9,9 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Store\BuildStore; +use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Store\ProjectStore; +use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -103,7 +106,17 @@ protected function setUp(): void ->method('getCommitId') ->willReturn('commit_hash'); - $interpolator = new BuildInterpolator($this->storeRegistry); + $secretStore = $this + ->getMockBuilder(SecretStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $environmentStore = $this + ->getMockBuilder(EnvironmentStore::class) + ->setConstructorArgs([$databaseManager, $this->storeRegistry]) + ->getMock(); + + $interpolator = new BuildInterpolator($environmentStore, $secretStore); $interpolator->setupInterpolationVars($this->build, 'http://php-censor.local/', '1.0.0'); $this->builder diff --git a/tests/src/StorePostgresTest.php b/tests/src/StorePostgresTest.php index 686e1fc9e..74166db0a 100644 --- a/tests/src/StorePostgresTest.php +++ b/tests/src/StorePostgresTest.php @@ -64,6 +64,7 @@ protected function setUp(): void $this->connection->exec('DROP TABLE IF EXISTS "environments"'); $this->connection->exec('DROP TABLE IF EXISTS "projects"'); $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); + $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); $this->connection->exec('DROP TABLE IF EXISTS "users"'); $phinxSettings = [ @@ -139,6 +140,7 @@ protected function tearDown(): void $this->connection->exec('DROP TABLE IF EXISTS "environments"'); $this->connection->exec('DROP TABLE IF EXISTS "projects"'); $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); + $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); $this->connection->exec('DROP TABLE IF EXISTS "users"'); $this->connection = null; From 65a098a490878e5247515af024741092cfbabc6a Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 5 Jun 2022 12:26:14 +0700 Subject: [PATCH 126/212] Added tests. --- tests/src/Model/Base/SecretTest.php | 118 +++++++++++++ tests/src/Store/SecretStoreMysqlTest.php | 181 +++++++++++++++++++ tests/src/Store/SecretStorePostgresTest.php | 182 ++++++++++++++++++++ 3 files changed, 481 insertions(+) create mode 100644 tests/src/Model/Base/SecretTest.php create mode 100644 tests/src/Store/SecretStoreMysqlTest.php create mode 100644 tests/src/Store/SecretStorePostgresTest.php diff --git a/tests/src/Model/Base/SecretTest.php b/tests/src/Model/Base/SecretTest.php new file mode 100644 index 000000000..23889dccd --- /dev/null +++ b/tests/src/Model/Base/SecretTest.php @@ -0,0 +1,118 @@ +getMockBuilder(ConfigurationInterface::class)->getMock(); + $databaseManager = $this + ->getMockBuilder(DatabaseManager::class) + ->setConstructorArgs([$configuration]) + ->getMock(); + $this->storeRegistry = $this + ->getMockBuilder(StoreRegistry::class) + ->setConstructorArgs([$databaseManager]) + ->getMock(); + } + + public function testConstruct(): void + { + $secret = new Secret($this->storeRegistry); + + self::assertInstanceOf(Model::class, $secret); + self::assertInstanceOf(Secret::class, $secret); + + self::assertEquals([ + 'id' => null, + 'name' => null, + 'value' => null, + 'create_date' => null, + 'user_id' => null, + ], $secret->getDataArray()); + } + + public function testId(): void + { + $secret = new Secret($this->storeRegistry); + + $result = $secret->setId(100); + self::assertEquals(true, $result); + self::assertEquals(100, $secret->getId()); + + $result = $secret->setId(100); + self::assertEquals(false, $result); + } + + public function testName(): void + { + $secret = new Secret($this->storeRegistry); + + $result = $secret->setName('name'); + self::assertEquals(true, $result); + self::assertEquals('name', $secret->getName()); + + $result = $secret->setName('name'); + self::assertEquals(false, $result); + } + + public function testValue(): void + { + $secret = new Secret($this->storeRegistry); + + $result = $secret->setValue('value'); + self::assertEquals(true, $result); + self::assertEquals('value', $secret->getValue()); + + $result = $secret->setValue('value'); + self::assertEquals(false, $result); + } + + public function testCreateDate(): void + { + $secret = new Secret($this->storeRegistry); + self::assertEquals(null, $secret->getCreateDate()); + + $secret = new Secret($this->storeRegistry); + $createDate = new \DateTime(); + + $result = $secret->setCreateDate($createDate); + self::assertEquals(true, $result); + self::assertEquals($createDate->getTimestamp(), $secret->getCreateDate()->getTimestamp()); + + $result = $secret->setCreateDate($createDate); + self::assertEquals(false, $result); + + $secret = new Secret($this->storeRegistry, ['create_date' => $createDate->format('Y-m-d H:i:s')]); + self::assertEquals($createDate->getTimestamp(), $secret->getCreateDate()->getTimestamp()); + + $secret = new Secret($this->storeRegistry, ['create_date' => 'Invalid Data']); + self::assertNull($secret->getCreateDate()); + } + + public function testUserId(): void + { + $secret = new Secret($this->storeRegistry); + + $result = $secret->setUserId(300); + self::assertEquals(true, $result); + self::assertEquals(300, $secret->getUserId()); + + $result = $secret->setUserId(300); + self::assertEquals(false, $result); + } +} diff --git a/tests/src/Store/SecretStoreMysqlTest.php b/tests/src/Store/SecretStoreMysqlTest.php new file mode 100644 index 000000000..970549bc7 --- /dev/null +++ b/tests/src/Store/SecretStoreMysqlTest.php @@ -0,0 +1,181 @@ + [ + 'database' => [ + 'servers' => [ + 'read' => [ + ['host' => '127.0.0.1'], + ], + 'write' => [ + ['host' => '127.0.0.1'], + ], + ], + 'type' => 'mysql', + 'name' => env('MYSQL_DBNAME'), + 'username' => env('MYSQL_USER'), + 'password' => env('MYSQL_PASSWORD'), + ], + ], + ]; + + try { + $this->connection = new \PDO( + 'mysql:host=localhost;dbname=' . env('MYSQL_DBNAME'), + env('MYSQL_USER'), + env('MYSQL_PASSWORD') + ); + + $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); + $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); + $this->connection->exec('DROP TABLE IF EXISTS `builds`'); + $this->connection->exec('DROP TABLE IF EXISTS `environments`'); + $this->connection->exec('DROP TABLE IF EXISTS `projects`'); + $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `users`'); + + $phinxSettings = [ + 'paths' => [ + 'migrations' => ROOT_DIR . 'src/Migrations', + ], + 'environments' => [ + 'default_migration_table' => 'migrations', + 'default_database' => 'php-censor', + 'php-censor' => [ + 'adapter' => 'mysql', + 'host' => '127.0.0.1', + 'name' => env('MYSQL_DBNAME'), + 'user' => env('MYSQL_USER'), + 'pass' => env('MYSQL_PASSWORD'), + ], + ], + ]; + $phinxConfig = new PhinxConfig($phinxSettings); + + try { + (new Migrate()) + ->setConfig($phinxConfig) + ->setName('php-censor-migrations:migrate') + ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); + } catch (\Throwable $e) { + //var_dump($e); + } + + $this->connection->exec(" + INSERT INTO `users` (`email`, `hash`, `name`, `is_admin`) VALUES + ('user1@test.test', 'abc1', 'user 1', 1), + ('user2@test.test', 'abc2', 'user 2', 0), + ('user3@test.test', 'abc3', 'user 3', 0), + ('user4@test.test', 'abc4', 'user 4', 0) + "); + + $this->connection->exec(" + INSERT INTO `secrets` (`name`, `value`, `create_date`, `user_id`) VALUES + ('secret 1', 'value 1', '2014-01-01 01:01:00', 1), + ('secret 2', 'value 2', '2015-01-01 01:01:00', 1), + ('secret 3', 'value 3', '2016-01-01 01:01:00', 1), + ('secret 4', 'value 4', '2017-01-01 01:01:00', 1), + ('secret 5', 'value 5', '2018-01-01 01:01:00', 2), + ('secret 6', 'value 6', '2018-02-01 01:01:00', 3), + ('secret 7', 'value 7', '2018-03-01 01:01:00', 4) + "); + } catch (\Throwable $e) { + //var_dump($e); + + $this->connection = null; + } + + $this->getConnection(); + + $configuration = new ArrayConfiguration($configurationArray); + $databaseManager = new DatabaseManager($configuration); + $this->storeRegistry = new StoreRegistry($databaseManager); + + $this->store = new SecretStore($databaseManager, $this->storeRegistry); + } + + protected function tearDown(): void + { + parent::tearDown(); + + if (null !== $this->connection) { + $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); + $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); + $this->connection->exec('DROP TABLE IF EXISTS `builds`'); + $this->connection->exec('DROP TABLE IF EXISTS `environments`'); + $this->connection->exec('DROP TABLE IF EXISTS `projects`'); + $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `users`'); + + $this->connection = null; + } + } + + protected function getConnection(): ?\PDO + { + if (null === $this->connection) { + $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + } + + return $this->connection; + } + + public function testGetByNamesSuccess(): void + { + /** @var Secret[] $result */ + $result = $this->store->getByNames(['secret 2', 'secret 5']); + + self::assertCount(2, $result); + + self::assertInstanceOf(Secret::class, $result['secret 2']); + self::assertEquals('secret 2', $result['secret 2']->getName()); + self::assertEquals('value 2', $result['secret 2']->getValue()); + self::assertEquals(1, $result['secret 2']->getUserId()); + + self::assertInstanceOf(Secret::class, $result['secret 5']); + self::assertEquals('secret 5', $result['secret 5']->getName()); + self::assertEquals('value 5', $result['secret 5']->getValue()); + self::assertEquals(2, $result['secret 5']->getUserId()); + } + + public function testGetByIdFailed(): void + { + /** @var Secret[] $result */ + $result = $this->store->getByNames(['secret 20', 'secret 50']); + + self::assertCount(0, $result); + } +} diff --git a/tests/src/Store/SecretStorePostgresTest.php b/tests/src/Store/SecretStorePostgresTest.php new file mode 100644 index 000000000..e0852ab37 --- /dev/null +++ b/tests/src/Store/SecretStorePostgresTest.php @@ -0,0 +1,182 @@ + [ + 'database' => [ + 'servers' => [ + 'read' => [ + ['host' => '127.0.0.1'], + ], + 'write' => [ + ['host' => '127.0.0.1'], + ], + ], + 'type' => 'pgsql', + 'name' => env('POSTGRESQL_DBNAME'), + 'username' => env('POSTGRESQL_USER'), + 'password' => env('POSTGRESQL_PASSWORD'), + ], + ], + ]; + + try { + $this->connection = new \PDO( + 'pgsql:host=localhost;dbname=' . env('POSTGRESQL_DBNAME'), + env('POSTGRESQL_USER'), + env('POSTGRESQL_PASSWORD') + ); + + $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); + $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); + $this->connection->exec('DROP TABLE IF EXISTS "builds"'); + $this->connection->exec('DROP TABLE IF EXISTS "environments"'); + $this->connection->exec('DROP TABLE IF EXISTS "projects"'); + $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); + $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); + $this->connection->exec('DROP TABLE IF EXISTS "users"'); + + $phinxSettings = [ + 'paths' => [ + 'migrations' => ROOT_DIR . 'src/Migrations', + ], + 'environments' => [ + 'default_migration_table' => 'migrations', + 'default_database' => 'php-censor', + 'php-censor' => [ + 'adapter' => 'pgsql', + 'host' => '127.0.0.1', + 'name' => env('POSTGRESQL_DBNAME'), + 'user' => env('POSTGRESQL_USER'), + 'pass' => env('POSTGRESQL_PASSWORD'), + ], + ], + ]; + $phinxConfig = new PhinxConfig($phinxSettings); + + try { + (new Migrate()) + ->setConfig($phinxConfig) + ->setName('php-censor-migrations:migrate') + ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); + } catch (\Throwable $e) { + //var_dump($e); + } + + $this->connection->exec(" + INSERT INTO \"users\" (\"email\", \"hash\", \"name\", \"is_admin\") VALUES + ('user1@test.test', 'abc1', 'user 1', 1), + ('user2@test.test', 'abc2', 'user 2', 0), + ('user3@test.test', 'abc3', 'user 3', 0), + ('user4@test.test', 'abc4', 'user 4', 0) + "); + + $this->connection->exec(" + INSERT INTO \"secrets\" (\"name\", \"value\", \"create_date\", \"user_id\") VALUES + ('secret 1', 'value 1', '2014-01-01 01:01:00', 1), + ('secret 2', 'value 2', '2015-01-01 01:01:00', 1), + ('secret 3', 'value 3', '2016-01-01 01:01:00', 1), + ('secret 4', 'value 4', '2017-01-01 01:01:00', 1), + ('secret 5', 'value 5', '2018-01-01 01:01:00', 2), + ('secret 6', 'value 6', '2018-02-01 01:01:00', 3), + ('secret 7', 'value 7', '2018-03-01 01:01:00', 4) + "); + } catch (\Throwable $e) { + //var_dump($e); + + $this->connection = null; + } + + $this->getConnection(); + + $configuration = new ArrayConfiguration($configurationArray); + $databaseManager = new DatabaseManager($configuration); + $this->storeRegistry = new StoreRegistry($databaseManager); + + $this->store = new SecretStore($databaseManager, $this->storeRegistry); + } + + protected function tearDown(): void + { + parent::tearDown(); + + if (null !== $this->connection) { + $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); + $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); + $this->connection->exec('DROP TABLE IF EXISTS "builds"'); + $this->connection->exec('DROP TABLE IF EXISTS "environments"'); + $this->connection->exec('DROP TABLE IF EXISTS "projects"'); + $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); + $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); + $this->connection->exec('DROP TABLE IF EXISTS "users"'); + + $this->connection = null; + } + } + + protected function getConnection(): ?\PDO + { + if (null === $this->connection) { + $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + } + + return $this->connection; + } + + public function testGetByNamesSuccess(): void + { + /** @var Secret[] $result */ + $result = $this->store->getByNames(['secret 2', 'secret 5']); + + self::assertCount(2, $result); + + self::assertInstanceOf(Secret::class, $result['secret 2']); + self::assertEquals('secret 2', $result['secret 2']->getName()); + self::assertEquals('value 2', $result['secret 2']->getValue()); + self::assertEquals(1, $result['secret 2']->getUserId()); + + self::assertInstanceOf(Secret::class, $result['secret 5']); + self::assertEquals('secret 5', $result['secret 5']->getName()); + self::assertEquals('value 5', $result['secret 5']->getValue()); + self::assertEquals(2, $result['secret 5']->getUserId()); + } + + public function testGetByIdFailed(): void + { + /** @var Secret[] $result */ + $result = $this->store->getByNames(['secret 20', 'secret 50']); + + self::assertCount(0, $result); + } +} From a88c393aeab5ed46287b5291189b8bedaa562560 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 5 Jun 2022 15:20:06 +0700 Subject: [PATCH 127/212] Added localization for secrets. --- src/Languages/lang.ru.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Languages/lang.ru.php b/src/Languages/lang.ru.php index b37c78a9b..8983458d9 100644 --- a/src/Languages/lang.ru.php +++ b/src/Languages/lang.ru.php @@ -173,7 +173,15 @@ Services вашего Bitbucket репозитория.', // Secrets - 'secrets' => 'Секреты', + 'secrets' => 'Секреты', + 'secret' => 'Секрет', + 'secret_edit' => 'Редактировать', + 'secret_delete' => 'Удалить', + 'secret_add' => 'Добавить секрет', + 'secret_add_edit' => 'Добавить / изменить секрет', + 'secret_name' => 'Название секрета', + 'secret_value' => 'Значение секрета', + 'secret_save' => 'Сохранить секрет', // Project Groups 'group_projects' => 'Группы проектов', From f1aeb3cc43ce48158c1268f694d6cecea2c86225 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 8 Jun 2022 23:10:43 +0700 Subject: [PATCH 128/212] Fixed release version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a57ce5cbe..d65c026fc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.7` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.8` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From ad7f8e948c52dc4c29805a8d8909e307556bd323 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 10:11:01 +0700 Subject: [PATCH 129/212] Fixed floating tests. --- tests/src/Plugin/PhpUnitTest.php | 3 --- tests/src/Plugin/Util/PhpUnitResultTest.php | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/tests/src/Plugin/PhpUnitTest.php b/tests/src/Plugin/PhpUnitTest.php index 405592503..b6c0a2ad5 100644 --- a/tests/src/Plugin/PhpUnitTest.php +++ b/tests/src/Plugin/PhpUnitTest.php @@ -11,9 +11,6 @@ use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; use PHPCensor\Plugin\PhpUnit; -use PHPCensor\Store\BuildStore; -use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\MockObject\MockBuilder; use PHPUnit\Framework\TestCase; diff --git a/tests/src/Plugin/Util/PhpUnitResultTest.php b/tests/src/Plugin/Util/PhpUnitResultTest.php index 152db4503..529fcd726 100644 --- a/tests/src/Plugin/Util/PhpUnitResultTest.php +++ b/tests/src/Plugin/Util/PhpUnitResultTest.php @@ -60,19 +60,6 @@ public function testInitParse(string $resultClass, string $testFile): void } catch (ExpectationFailedException $e) { self::$skipped[] = ['cls' => $resultClass, 'ex' => $e]; } - - // testSkippedAnything(): Used as long as junit format does not provide message for skipped tests - if (self::$skipped) { - $msg = "Skipped result tests:\n"; - foreach (self::$skipped as $skip) { - $exMsg = \strstr((string)$skip['ex'], "\n", true); - if (false === $exMsg) { - $exMsg = (string)$skip['ex']; - } - $msg .= \sprintf(" * %s: %s \n", $skip['cls'], $exMsg); - } - $this->markTestSkipped($msg); - } } public static function getTestData(): array From ae455eed3a7edbbc1e8e962cc89a5a39a0daee19 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 14:25:24 +0700 Subject: [PATCH 130/212] Improved and fixed charts and frontend widgets. --- public/assets/js/build-plugins/loc.js | 18 ++++++++++---- .../js/build-plugins/phpunit-coverage.js | 14 +++++++---- public/assets/js/build-plugins/warnings.js | 24 ++++++++++++------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index 9c782914d..4cbcf0744 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -9,7 +9,7 @@ var locPlugin = ActiveBuild.UiPlugin.extend({ register: function () { var self = this; - var query = ActiveBuild.registerQuery('php_loc-data', -1, {num_builds: 10, key: 'php_loc-data'}); + var query = ActiveBuild.registerQuery('php_loc-data', -1, {num_builds: 20, key: 'php_loc-data'}); $(window).on('php_loc-data', function (data) { self.onUpdate(data); @@ -58,25 +58,33 @@ var locPlugin = ActiveBuild.UiPlugin.extend({ label: Lang.get('lines'), borderColor: "#555299", backgroundColor: "#555299", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }, { label: Lang.get('logical_lines'), borderColor: "#00A65A", backgroundColor: "#00A65A", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }, { label: Lang.get('comment_lines'), borderColor: "#8AA4AF", backgroundColor: "#8AA4AF", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }, { label: Lang.get('noncomment_lines'), borderColor: "#00A7D0", backgroundColor: "#00A7D0", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 } ] }; diff --git a/public/assets/js/build-plugins/phpunit-coverage.js b/public/assets/js/build-plugins/phpunit-coverage.js index 87560c680..15a731b9e 100644 --- a/public/assets/js/build-plugins/phpunit-coverage.js +++ b/public/assets/js/build-plugins/phpunit-coverage.js @@ -9,7 +9,7 @@ var coveragePlugin = ActiveBuild.UiPlugin.extend({ register: function () { var self = this; - var query = ActiveBuild.registerQuery('php_unit-coverage', -1, {num_builds: 10, key: 'php_unit-coverage'}); + var query = ActiveBuild.registerQuery('php_unit-coverage', -1, {num_builds: 20, key: 'php_unit-coverage'}); $(window).on('php_unit-coverage', function (data) { self.onUpdate(data); @@ -58,19 +58,25 @@ var coveragePlugin = ActiveBuild.UiPlugin.extend({ label: Lang.get('classes'), borderColor: "#555299", backgroundColor: "#555299", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }, { label: Lang.get('methods'), borderColor: "#00A65A", backgroundColor: "#00A65A", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }, { label: Lang.get('lines'), borderColor: "#8AA4AF", backgroundColor: "#8AA4AF", - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 } ] }; diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index be74706e4..d4a03ce06 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -24,13 +24,14 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ displayOnUpdate: false, rendered: false, chartData: null, + showWidget: false, register: function () { var self = this; var queries = []; for (var key in self.keys) { - queries.push(ActiveBuild.registerQuery(key, -1, {num_builds: 10, key: key})); + queries.push(ActiveBuild.registerQuery(key, -1, {num_builds: 20, key: key})); } $(window).on(Object.keys(self.keys).join(' '), function (data) { @@ -62,14 +63,19 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ }, onUpdate: function (e) { - if (!e.queryData || $.isEmptyObject(e.queryData)) { - $('#build-warnings').hide(); - return; - } - var self = this; var builds = e.queryData; + if (!self.showWidget) { + if (!e.queryData || $.isEmptyObject(e.queryData)) { + $('#build-warnings').hide(); + + return; + } + } + + self.showWidget = true; + if (!builds || !builds.length) { return; } @@ -130,7 +136,9 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ label: self.keys[key], borderColor: color, backgroundColor: color, - data: [] + data: [], + cubicInterpolationMode: 'monotone', + tension: 0.2 }); for (var build in self.data) { @@ -153,7 +161,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ var self = this; if ($('#information').hasClass('active') && self.chartData) { - $('#build-warnings-chart').show(); + $('#build-warnings').show(); var ctx = $("#build-warnings-linechart").get(0).getContext("2d"); From 4418ac4fa28b1dc346744f62dc356533a68ccb67 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 22:45:22 +0700 Subject: [PATCH 131/212] Fixed types. --- src/Plugin/Behat.php | 2 +- src/Plugin/Pahout.php | 2 +- src/Plugin/Phan.php | 4 ++-- src/Plugin/Phlint.php | 2 +- src/Plugin/PhpCodeSniffer.php | 2 +- src/Plugin/PhpStan.php | 2 +- src/Plugin/PhpUnit.php | 2 +- src/Plugin/Psalm.php | 8 ++++---- src/Plugin/SecurityChecker.php | 2 -- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/Plugin/Behat.php b/src/Plugin/Behat.php index 02aa29027..710a2802b 100644 --- a/src/Plugin/Behat.php +++ b/src/Plugin/Behat.php @@ -113,7 +113,7 @@ public function parseBehatOutput() 'Behat scenario failed.', BuildError::SEVERITY_HIGH, $lineParts[0], - $lineParts[1] + (int)$lineParts[1] ); } } diff --git a/src/Plugin/Pahout.php b/src/Plugin/Pahout.php index 5d8aded6a..a997ff785 100644 --- a/src/Plugin/Pahout.php +++ b/src/Plugin/Pahout.php @@ -87,7 +87,7 @@ public function execute() $hint['message'], BuildError::SEVERITY_LOW, $hint['file'], - $hint['line_from'] + (int)$hint['line_from'] ); } } diff --git a/src/Plugin/Phan.php b/src/Plugin/Phan.php index c45120538..f3eeefe9c 100644 --- a/src/Plugin/Phan.php +++ b/src/Plugin/Phan.php @@ -123,8 +123,8 @@ protected function processReport($jsonString) $data['check_name']."\n\n".$data['description'], $this->severity($data['severity']), isset($data['location']['path']) ? $data['location']['path'] : '??', - isset($data['location']['lines']['begin']) ? $data['location']['lines']['begin'] : '??', - isset($data['location']['lines']['end']) ? $data['location']['lines']['end'] : '??' + isset($data['location']['lines']['begin']) ? (int)$data['location']['lines']['begin'] : null, + isset($data['location']['lines']['end']) ? (int)$data['location']['lines']['end'] : null ); $warnings++; diff --git a/src/Plugin/Phlint.php b/src/Plugin/Phlint.php index 1b64c15bb..91501e8a0 100644 --- a/src/Plugin/Phlint.php +++ b/src/Plugin/Phlint.php @@ -67,7 +67,7 @@ public function execute() $error['message'], BuildError::SEVERITY_HIGH, $error['file'], - $error['line_from'] + (int)$error['line_from'] ); } } diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index bbaa3480c..c195065a7 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -263,7 +263,7 @@ protected function processReport($output) 'PHPCS: ' . $message['message'], 'ERROR' === $message['type'] ? BuildError::SEVERITY_HIGH : BuildError::SEVERITY_LOW, $fileName, - $message['line'] + (int)$message['line'] ); } } diff --git a/src/Plugin/PhpStan.php b/src/Plugin/PhpStan.php index 99682e833..270efe20e 100644 --- a/src/Plugin/PhpStan.php +++ b/src/Plugin/PhpStan.php @@ -104,7 +104,7 @@ public function execute() $message['message'], BuildError::SEVERITY_NORMAL, $filename, - $message['line'] + (int)$message['line'] ); } $separator = \str_repeat('-', 6) . ' ' . \str_repeat('-', $len + 2) . PHP_EOL; diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index 3b94b7807..bf7d407fc 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -324,7 +324,7 @@ protected function processResults($logFile, $logFormat) $error['message'], $severity, $error['file'], - $error['line'] + (int)$error['line'] ); } \unlink($logFile); diff --git a/src/Plugin/Psalm.php b/src/Plugin/Psalm.php index 7fc3d6d6c..257add7d7 100644 --- a/src/Plugin/Psalm.php +++ b/src/Plugin/Psalm.php @@ -80,8 +80,8 @@ public function execute() $error['message'], BuildError::SEVERITY_HIGH, $error['file'], - $error['line_from'], - $error['line_to'] + (int)$error['line_from'], + (int)$error['line_to'] ); } } @@ -100,8 +100,8 @@ public function execute() $info['message'], BuildError::SEVERITY_LOW, $info['file'], - $info['line_from'], - $info['line_to'] + (int)$info['line_from'], + (int)$info['line_to'] ); } } diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index e5e6d5ffa..747f0fd9a 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -122,8 +122,6 @@ public function execute() self::pluginName(), $library . ' (' . $warning['version'] . ")\n" . $data['cve'] . ': ' . $data['title'] . "\n" . $data['link'], BuildError::SEVERITY_CRITICAL, - '-', - '-' ); } } From 664bf5a2b7a0344861f472642cc6a80d26119ec2 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 22:50:59 +0700 Subject: [PATCH 132/212] Fixed exception. --- src/Application.php | 2 +- src/Builder.php | 6 +++--- src/Controller/BuildStatusController.php | 6 +++--- src/Controller/WebhookController.php | 18 +++++++++--------- src/Form/Input.php | 2 +- src/Helper/Xml.php | 4 +--- src/Logging/Handler.php | 2 +- src/Model.php | 2 +- src/Model/Build.php | 2 +- src/Model/Build/BitbucketBuild.php | 2 +- src/Model/Build/BitbucketServerBuild.php | 2 +- src/Model/Build/GithubBuild.php | 2 +- src/Plugin/Mage.php | 2 +- src/Plugin/Mage3.php | 2 +- src/Plugin/Mysql.php | 2 +- src/Plugin/Pgsql.php | 2 +- src/Plugin/Phar.php | 2 +- src/Plugin/Sqlite.php | 2 +- src/Plugin/Util/Executor.php | 2 +- src/Service/BuildService.php | 6 +++--- src/Store/BuildStore.php | 2 +- src/Worker/BuildWorker.php | 6 +++--- 22 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/Application.php b/src/Application.php index 21186d98c..2e92f5db2 100644 --- a/src/Application.php +++ b/src/Application.php @@ -174,7 +174,7 @@ public function handleRequest(): Response $response->setStatusCode($ex->getErrorCode()); $response->setContent($view->render()); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $view = new View('exception'); $view->exception = $ex; diff --git a/src/Builder.php b/src/Builder.php index 2a1fdba2b..980f49928 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -196,7 +196,7 @@ public function execute(): void } else { $this->build->setStatusFailed(); } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $success = false; $this->build->setStatusFailed(); $this->buildLogger->logFailure('Exception: ' . $ex->getMessage(), $ex); @@ -220,7 +220,7 @@ public function execute(): void $this->pluginExecutor->executePlugins($this->config, Build::STAGE_BROKEN); } } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->buildLogger->logFailure('Exception: ' . $ex->getMessage(), $ex); } @@ -238,7 +238,7 @@ public function execute(): void // Complete stage plugins are always run $this->currentStage = Build::STAGE_COMPLETE; $this->pluginExecutor->executePlugins($this->config, Build::STAGE_COMPLETE); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->buildLogger->logFailure('Exception: ' . $ex->getMessage()); } diff --git a/src/Controller/BuildStatusController.php b/src/Controller/BuildStatusController.php index 2bffd4d57..0ccf5d6cc 100644 --- a/src/Controller/BuildStatusController.php +++ b/src/Controller/BuildStatusController.php @@ -64,7 +64,7 @@ protected function getStatus(Project $project, string $branch): string if (isset($build) && $build instanceof Build && $build->getStatus() !== Build::STATUS_SUCCESS) { $status = 'failed'; } - } catch (Exception $e) { + } catch (\Throwable $e) { $status = 'error'; } @@ -101,7 +101,7 @@ protected function getPhpunitCoverage(Project $project, string $branch, string $ $coverage = $coverageMeta[0]['meta_value'][$type]; } } - } catch (Exception $e) { + } catch (\Throwable $e) { } return $coverage; @@ -313,7 +313,7 @@ public function ccxml(int $projectId): Response } } } - } catch (Exception $e) { + } catch (\Throwable $e) { $xml = new SimpleXMLElement(''); } diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index cfafa4452..bce74c805 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -89,7 +89,7 @@ public function handleAction(string $action, array $actionParams): Response unset($data['responseCode']); } $response->setContent($data); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $response->setStatusCode(500); $response->setData(['status' => 'failed', 'error' => $ex->getMessage()]); } @@ -536,7 +536,7 @@ protected function bitbucketCommitRequest(Project $project, array $payload): arr $commit['new']['target']['message'] ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$commit['new']['target']['hash']] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } @@ -623,7 +623,7 @@ protected function bitbucketPullRequest(Project $project, array $payload): array $extra ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$id] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } @@ -675,7 +675,7 @@ protected function bitbucketSvrPullRequest(Project $project, array $payload): ar $extra ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$id] = ['status' => 'failed', 'error' => $ex->getMessage()]; } @@ -705,7 +705,7 @@ protected function bitbucketService(array $payload, Project $project): array $commit['message'] ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$commit['raw_node']] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } @@ -805,7 +805,7 @@ protected function githubCommitRequest(Project $project, array $payload): array ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$commit['id']] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } @@ -897,7 +897,7 @@ protected function githubPullRequest(Project $project, array $payload): array $extra ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$id] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } @@ -970,7 +970,7 @@ public function gitlab(int $projectId): array $commit['message'] ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$commit['id']] = ['status' => 'failed', 'error' => $ex->getMessage()]; } @@ -1051,7 +1051,7 @@ protected function gogsCommitRequest(Project $project, array $payload): array $commit['message'] ); $status = 'ok'; - } catch (Exception $ex) { + } catch (\Throwable $ex) { $results[$commit['id']] = ['status' => 'failed', 'error' => $ex->getMessage()]; } } diff --git a/src/Form/Input.php b/src/Form/Input.php index 2c06e1296..62ab3146a 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -140,7 +140,7 @@ public function validate(): bool if (\is_callable($validator)) { try { \call_user_func_array($validator, [$this->getValue()]); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->error = $ex->getMessage(); return false; diff --git a/src/Helper/Xml.php b/src/Helper/Xml.php index aadf2b17c..704b403f4 100644 --- a/src/Helper/Xml.php +++ b/src/Helper/Xml.php @@ -26,9 +26,7 @@ public static function loadFromFile($filePath) try { $xml = \simplexml_load_file('php://filter/read=xml_utf8_clean/resource=' . $filePath); - } catch (Exception $ex) { - $xml = null; - } catch (\Throwable $ex) { // since php7 + } catch (\Throwable $ex) { $xml = null; } diff --git a/src/Logging/Handler.php b/src/Logging/Handler.php index affea06d6..5ff2a419a 100644 --- a/src/Logging/Handler.php +++ b/src/Logging/Handler.php @@ -84,7 +84,7 @@ public function handleFatalError(): void ); $this->log($error); } - } catch (Exception $e) { + } catch (\Throwable $e) { $error = new ErrorException( \sprintf( '%s: %s in %s line %d', diff --git a/src/Model.php b/src/Model.php index 5f60261cb..44058e230 100644 --- a/src/Model.php +++ b/src/Model.php @@ -101,7 +101,7 @@ private function castToDataType(string $type, $value) } try { return new DateTime($value); - } catch (Exception $e) { + } catch (\Throwable $e) { return null; } diff --git a/src/Model/Build.php b/src/Model/Build.php index a8bf18136..a31b8673c 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -438,7 +438,7 @@ public function removeBuildDirectory(bool $withArtifacts = false) $fileSystem->remove(PUBLIC_DIR . 'artifacts/pdepend/' . $buildDirectory); $fileSystem->remove(PUBLIC_DIR . 'artifacts/phpunit/' . $buildDirectory); } - } catch (Exception $e) { + } catch (\Throwable $e) { } } diff --git a/src/Model/Build/BitbucketBuild.php b/src/Model/Build/BitbucketBuild.php index ff3bbb6ad..3a4918be5 100644 --- a/src/Model/Build/BitbucketBuild.php +++ b/src/Model/Build/BitbucketBuild.php @@ -216,7 +216,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul \unlink($diffFile); $skipGitFinalization = true; } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $success = false; } diff --git a/src/Model/Build/BitbucketServerBuild.php b/src/Model/Build/BitbucketServerBuild.php index 15963142e..2c0707c1d 100644 --- a/src/Model/Build/BitbucketServerBuild.php +++ b/src/Model/Build/BitbucketServerBuild.php @@ -133,7 +133,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $skipGitFinalization = true; } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $success = false; } diff --git a/src/Model/Build/GithubBuild.php b/src/Model/Build/GithubBuild.php index 5325da072..1b537b975 100644 --- a/src/Model/Build/GithubBuild.php +++ b/src/Model/Build/GithubBuild.php @@ -252,7 +252,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch(), $pullRequestId); } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $success = false; } diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index cfbd99ebb..d86857c04 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -59,7 +59,7 @@ public function execute() $this->builder->log('########## MAGE LOG BEGIN ##########'); $this->builder->log($this->getMageLog()); $this->builder->log('########## MAGE LOG END ##########'); - } catch (Exception $e) { + } catch (\Throwable $e) { $this->builder->logFailure($e->getMessage()); } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index 67c71f115..587a36e26 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -64,7 +64,7 @@ public function execute() $this->builder->log('########## MAGE LOG BEGIN ##########'); $this->builder->log($this->getMageLog()); $this->builder->log('########## MAGE LOG END ##########'); - } catch (Exception $e) { + } catch (\Throwable $e) { $this->builder->logFailure($e->getMessage()); } diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 8b8c4c111..662c09ca4 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -155,7 +155,7 @@ public function execute() foreach ($this->imports as $import) { $this->executeFile($import); } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->builder->logFailure($ex->getMessage()); return false; diff --git a/src/Plugin/Pgsql.php b/src/Plugin/Pgsql.php index 8e9f666d9..d25d4ee23 100644 --- a/src/Plugin/Pgsql.php +++ b/src/Plugin/Pgsql.php @@ -123,7 +123,7 @@ public function execute() foreach ($this->queries as $query) { $pdo->query($query); } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->builder->logFailure($ex->getMessage()); return false; diff --git a/src/Plugin/Phar.php b/src/Plugin/Phar.php index 03b70aa52..de79d390b 100644 --- a/src/Plugin/Phar.php +++ b/src/Plugin/Phar.php @@ -177,7 +177,7 @@ public function execute() } $success = true; - } catch (Exception $e) { + } catch (\Throwable $e) { $this->builder->logFailure('Phar Plugin Internal Error. Exception: ' . $e->getMessage()); } diff --git a/src/Plugin/Sqlite.php b/src/Plugin/Sqlite.php index beb4cb575..c052e70b4 100644 --- a/src/Plugin/Sqlite.php +++ b/src/Plugin/Sqlite.php @@ -86,7 +86,7 @@ public function execute() foreach ($this->queries as $query) { $pdo->query($query); } - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->builder->logFailure($ex->getMessage()); return false; diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 7cb892192..62266fa1e 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -242,7 +242,7 @@ public function executePlugin($plugin, $options) $obj->setStoreRegistry($this->storeRegistry); return $obj->execute(); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->logger->logFailure('Exception: ' . $ex->getMessage(), $ex); return false; diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index edea08e71..1617687af 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -184,7 +184,7 @@ public function createPeriodicalBuilds(LoggerInterface $logger): void try { $interval = new DateInterval($projectConfig['interval']); - } catch (Exception $e) { + } catch (\Throwable $e) { $logger->error( \sprintf( 'Invalid datetime interval for project #%s! Exception: %s', @@ -310,7 +310,7 @@ public function deleteAllByProject(int $projectId): void $fileSystem->remove($projectPath); } } - } catch (Exception $e) { + } catch (\Throwable $e) { } } @@ -366,7 +366,7 @@ public function addJobToQueue(string $jobType, array $jobData, int $queuePriorit PheanstalkInterface::DEFAULT_DELAY, $this->configuration->get('php-censor.queue.lifetime', 600) ); - } catch (Exception $ex) { + } catch (\Throwable $ex) { $this->queueError = true; } } diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 29b92d26a..929f39e46 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -503,7 +503,7 @@ public function getTestCoverage(int $buildId): string $coverage = $coverageMeta[0]['meta_value'][$type]; } } - } catch (Exception $e) { + } catch (\Throwable $e) { } return $coverage; diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 5342d38a4..c998e66f6 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -185,7 +185,7 @@ protected function runWorker(): void try { $builder->execute(); - } catch (Exception $e) { + } catch (\Throwable $e) { $builder->getBuildLogger()->log(''); $builder->getBuildLogger()->logFailure( \sprintf( @@ -217,7 +217,7 @@ protected function deleteJob(Job $job): void { try { $this->pheanstalk->delete($job); - } catch (Exception $e) { + } catch (\Throwable $e) { $this->logger->warning($e->getMessage()); } } @@ -226,7 +226,7 @@ protected function canForceRewindLoop(): bool { try { $this->pheanstalk->peekReady(); - } catch (Exception $e) { + } catch (\Throwable $e) { return true; } From 14bd0db28265ac4bf4be438fb7ff2fe00a25483f Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 22:52:07 +0700 Subject: [PATCH 133/212] Fix part 1. --- src/Plugin/SecurityChecker.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index 747f0fd9a..e5e6d5ffa 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -122,6 +122,8 @@ public function execute() self::pluginName(), $library . ' (' . $warning['version'] . ")\n" . $data['cve'] . ': ' . $data['title'] . "\n" . $data['link'], BuildError::SEVERITY_CRITICAL, + '-', + '-' ); } } From 3e85cdc7d3739e6fad9b3b284694f16cbeef7201 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 9 Jun 2022 22:56:56 +0700 Subject: [PATCH 134/212] Fix part 2. --- src/Plugin/SecurityChecker.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index e5e6d5ffa..2f7bf71be 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -111,7 +111,7 @@ public function execute() $builder->logExecOutput(true); $success = true; - $result = (string)$builder->getLastOutput(); + $result = $builder->getLastOutput(); $warnings = \json_decode($result, true); if ($warnings) { @@ -121,9 +121,7 @@ public function execute() $this->builder, self::pluginName(), $library . ' (' . $warning['version'] . ")\n" . $data['cve'] . ': ' . $data['title'] . "\n" . $data['link'], - BuildError::SEVERITY_CRITICAL, - '-', - '-' + BuildError::SEVERITY_CRITICAL ); } } From e5dbf8c8a4619a1303e45c9122fdec9443086d91 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 11 Jun 2022 14:03:05 +0700 Subject: [PATCH 135/212] Updated dependencies. --- composer.lock | 252 +++++++++++++++++++++++++------------------------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/composer.lock b/composer.lock index 74d90391b..2a77db816 100644 --- a/composer.lock +++ b/composer.lock @@ -8,21 +8,21 @@ "packages": [ { "name": "cakephp/core", - "version": "4.3.9", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "499f17738d40560ec077d7d2039c9af4969c6b17" + "reference": "884555efcf573ea23597f9c88a12ed6d58af00f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/499f17738d40560ec077d7d2039c9af4969c6b17", - "reference": "499f17738d40560ec077d7d2039c9af4969c6b17", + "url": "https://api.github.com/repos/cakephp/core/zipball/884555efcf573ea23597f9c88a12ed6d58af00f3", + "reference": "884555efcf573ea23597f9c88a12ed6d58af00f3", "shasum": "" }, "require": { "cakephp/utility": "^4.0", - "php": ">=7.2.0" + "php": ">=7.4.0" }, "suggest": { "cakephp/cache": "To use Configure::store() and restore().", @@ -61,26 +61,26 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2022-03-10T13:13:51+00:00" + "time": "2022-05-31T20:57:08+00:00" }, { "name": "cakephp/database", - "version": "4.3.9", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "f565f9d296817692031852d142ee28e0d48f4dd9" + "reference": "9bb8b691f36729fd630118a1cc7b52f9ae13d126" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/f565f9d296817692031852d142ee28e0d48f4dd9", - "reference": "f565f9d296817692031852d142ee28e0d48f4dd9", + "url": "https://api.github.com/repos/cakephp/database/zipball/9bb8b691f36729fd630118a1cc7b52f9ae13d126", + "reference": "9bb8b691f36729fd630118a1cc7b52f9ae13d126", "shasum": "" }, "require": { "cakephp/core": "^4.0", "cakephp/datasource": "^4.0", - "php": ">=7.2.0" + "php": ">=7.4.0" }, "suggest": { "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types." @@ -116,25 +116,25 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2022-03-29T14:10:04+00:00" + "time": "2022-04-12T01:11:53+00:00" }, { "name": "cakephp/datasource", - "version": "4.3.9", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "106ac9cb54a852f286dd2fe21e131c51f4a3d7fb" + "reference": "be1f2177054df1904588fd4775f8954837529a9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/106ac9cb54a852f286dd2fe21e131c51f4a3d7fb", - "reference": "106ac9cb54a852f286dd2fe21e131c51f4a3d7fb", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/be1f2177054df1904588fd4775f8954837529a9b", + "reference": "be1f2177054df1904588fd4775f8954837529a9b", "shasum": "" }, "require": { "cakephp/core": "^4.0", - "php": ">=7.2.0", + "php": ">=7.4.0", "psr/log": "^1.0 || ^2.0", "psr/simple-cache": "^1.0 || ^2.0" }, @@ -174,25 +174,25 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-05-10T07:45:43+00:00" + "time": "2022-05-13T04:02:19+00:00" }, { "name": "cakephp/utility", - "version": "4.3.9", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "3d352060ca3e49c81c3fd2bdb092ee345d8f4e38" + "reference": "b2a47e038954432b2e09d3406559a75656ebe131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/3d352060ca3e49c81c3fd2bdb092ee345d8f4e38", - "reference": "3d352060ca3e49c81c3fd2bdb092ee345d8f4e38", + "url": "https://api.github.com/repos/cakephp/utility/zipball/b2a47e038954432b2e09d3406559a75656ebe131", + "reference": "b2a47e038954432b2e09d3406559a75656ebe131", "shasum": "" }, "require": { "cakephp/core": "^4.0", - "php": ">=7.2.0" + "php": ">=7.4.0" }, "suggest": { "ext-intl": "To use Text::transliterate() or Text::slug()", @@ -233,7 +233,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-01-28T18:02:00+00:00" + "time": "2022-05-20T04:16:49+00:00" }, { "name": "doctrine/lexer", @@ -313,16 +313,16 @@ }, { "name": "egulias/email-validator", - "version": "3.1.2", + "version": "3.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ee0db30118f661fb166bcffbf5d82032df484697" + "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697", - "reference": "ee0db30118f661fb166bcffbf5d82032df484697", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a5ed8d58ed0c340a7c2109f587951b1c84cf6286", + "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286", "shasum": "" }, "require": { @@ -369,7 +369,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.1.2" + "source": "https://github.com/egulias/EmailValidator/tree/3.2" }, "funding": [ { @@ -377,20 +377,20 @@ "type": "github" } ], - "time": "2021-10-11T09:18:27+00:00" + "time": "2022-05-28T22:19:18+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.6", + "version": "6.5.7", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "f092dd734083473658de3ee4bef093ed77d2689c" + "reference": "724562fa861e21a4071c652c8a159934e4f05592" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c", - "reference": "f092dd734083473658de3ee4bef093ed77d2689c", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592", + "reference": "724562fa861e21a4071c652c8a159934e4f05592", "shasum": "" }, "require": { @@ -476,7 +476,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.6" + "source": "https://github.com/guzzle/guzzle/tree/6.5.7" }, "funding": [ { @@ -492,7 +492,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T13:19:12+00:00" + "time": "2022-06-09T21:36:50+00:00" }, { "name": "guzzlehttp/promises", @@ -838,16 +838,16 @@ }, { "name": "monolog/monolog", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0" + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", "shasum": "" }, "require": { @@ -926,7 +926,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.6.0" + "source": "https://github.com/Seldaek/monolog/tree/2.7.0" }, "funding": [ { @@ -938,7 +938,7 @@ "type": "tidelift" } ], - "time": "2022-05-10T09:36:00+00:00" + "time": "2022-06-09T08:59:12+00:00" }, { "name": "pda/pheanstalk", @@ -3057,16 +3057,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -3081,7 +3081,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3119,7 +3119,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -3135,20 +3135,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" + "reference": "143f1881e655bebca1312722af8068de235ae5dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc", + "reference": "143f1881e655bebca1312722af8068de235ae5dc", "shasum": "" }, "require": { @@ -3163,7 +3163,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3202,7 +3202,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0" }, "funding": [ { @@ -3218,20 +3218,20 @@ "type": "tidelift" } ], - "time": "2022-01-04T09:04:05+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -3243,7 +3243,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3283,7 +3283,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -3299,20 +3299,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44" + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", "shasum": "" }, "require": { @@ -3326,7 +3326,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3370,7 +3370,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" }, "funding": [ { @@ -3386,20 +3386,20 @@ "type": "tidelift" } ], - "time": "2021-09-14T14:02:44+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -3411,7 +3411,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3454,7 +3454,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -3470,20 +3470,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -3498,7 +3498,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3537,7 +3537,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -3553,20 +3553,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", "shasum": "" }, "require": { @@ -3575,7 +3575,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3613,7 +3613,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" }, "funding": [ { @@ -3629,20 +3629,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", "shasum": "" }, "require": { @@ -3651,7 +3651,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3692,7 +3692,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" }, "funding": [ { @@ -3708,20 +3708,20 @@ "type": "tidelift" } ], - "time": "2021-06-05T21:20:04+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -3730,7 +3730,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3775,7 +3775,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -3791,20 +3791,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { @@ -3813,7 +3813,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3854,7 +3854,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" }, "funding": [ { @@ -3870,7 +3870,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:11+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/process", @@ -5392,16 +5392,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.14.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", "shasum": "" }, "require": { @@ -5442,9 +5442,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2022-05-31T20:59:12+00:00" }, { "name": "ondram/ci-detector", @@ -8326,21 +8326,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -8378,9 +8378,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" }, { "name": "webmozart/path-util", From 4f0e5a44ac910c45a0054ef0ae29442c89a4e9fc Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 11 Jun 2022 13:58:28 +0700 Subject: [PATCH 136/212] Added secrets to CI config. --- .php-censor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.php-censor.yml b/.php-censor.yml index 9cb0ac853..effd305bd 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -38,3 +38,8 @@ test: complete: email_notify: default_mailto_address: poisoncorpsee@gmail.com + telegram_notify: + auth_token: "%SECRET:telegram_auth_token%" + recipients: + - "%SECRET:telegram_chat_id%" + send_log: false From ab7b4c0dca3c5c966b02094d55f85b71d2b65d53 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 11 Jun 2022 22:54:05 +0700 Subject: [PATCH 137/212] Fixed release version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d65c026fc..1e571faf7 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.8` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.9` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 631ef6db5b88b31e3eeff666efc6bffca637a564 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 13 Jun 2022 15:25:08 +0700 Subject: [PATCH 138/212] Added documentation section for secret variables. --- docs/en/interpolation.md | 32 ++++++++++++++++---------------- docs/images/menu-secrets.png | Bin 0 -> 43434 bytes 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 docs/images/menu-secrets.png diff --git a/docs/en/interpolation.md b/docs/en/interpolation.md index 64240a656..24c0420f7 100644 --- a/docs/en/interpolation.md +++ b/docs/en/interpolation.md @@ -1,6 +1,9 @@ Injecting variables into messages ================================= +Precompiled variables +--------------------- + Most strings used in the build configuration can have variables related to the build inserted into them with the following syntax: @@ -11,37 +14,34 @@ following syntax: Where `VARIABLE` can be one of the following: * **COMMIT_ID** - The commit hash. - * **SHORT_COMMIT_ID** - The shortened version of the commit hash. - * **COMMITTER_EMAIL** - The Email address of the committer. - * **COMMIT_MESSAGE** - The message written by the committer. - * **COMMIT_LINK** - The URL to the commit. - * **BRANCH** - The name of the branch. - * **BRANCH_LINK** - The URL to the branch. - * **ENVIRONMENT** - Build environment (See [environments](environments.md)). - * **SYSTEM_VERSION** - Version of PHP Censor application. - * **PROJECT_ID** - The ID of the project. - * **BUILD_ID** - The build number. - * **PROJECT_TITLE** - The name of the project. - * **PROJECT_LINK** - The URL to the project in PHP Censor. - * **BUILD_PATH** - The path to the build. - * **BUILD_LINK** - The URL to the build in PHP Censor. -* **CURRENT_DATE** - Current date in format "Y-m-d". +* **CURRENT_DATE** - Current date in format "Y-m-d". * **CURRENT_TIME** - Current time in format "H-i-s". - * **CURRENT_DATETIME** - Current date and time in format "Y-m-d_H-i-s". + +Secret variables +---------------- + +![See "Admin Options" -> "Secrets"](../images/menu-secrets.png "See 'Admin Options' -> 'Secrets'") + +Also, you can create secret variable in admin interface (Open "Admin Options" -> "Secrets" section in admin interface: +`://php-censor.local/secret`) and use it as variable in build configuration like: + +``` +"My important message is about %SECRET:secret-name%" +``` diff --git a/docs/images/menu-secrets.png b/docs/images/menu-secrets.png new file mode 100644 index 0000000000000000000000000000000000000000..56283aa19010ce3999cfa2edee98509a2cab99dc GIT binary patch literal 43434 zcmbrlV~}N0*Cv=&B`a;)wryLLwr$(CRcYH+rR_@F_S|~E{(7eWOiWMTh>W_r1 zuXWaXPK1J-I2;TX3=j|yoTP+^5)crG1`rVN0~7>cWmiFY5eVqVsi%sDvyy=ufxV-h zsfD!(fwPCb34w{bg((n_`+7;bMdEn}oY=P$s%9WmB2Ya}tm>LzY946wd(Vaky|C(q zrDiHAJWvmC&NTm*@4}9IgtTn4rnE~eoB>mOz!`Qm;O&h&oY z&~jXS(YpA^B7l+qU^c z`}^iY#$PM_UQ@HGMe}^+d+l-kyND{JJa6J{TK{WP+++EUtdhaF>&LM-8T_RWHKFce zlh1ZqW^R?+;m0OT*FLizsg>T^OO?mLliqp64!1u0^?Q#r8&WyZtHfczVDr5d?JIM2 zH!?oi)y!^gCPwwq{dezzU+3;ND&YjMaSna1W}1kWVPi(ap1Yk^LgFWN@g>~tjMS@d zGrQS@1|BHS2nmlasUM8e_Nq9<2=>v_#^BDQtW>(DCd?y(Bhg6p(K3tBf@mU=)r_7Q z;Wm+fr3R{%9>m7@dNFE>Rh6$ zsVy?$%d_`zd6@c`bvAG|&eYuZt)7f~vSv@WNqDL|ELps6pXKxA)LPogR>oLqJ*!pB z93r0<7oxGxR(|DX|2CKT6vlHLUn^vbn!b&)@}mx)9I1X#Sy%Sww#sNiGt(!|)D&9* zaiE17CcuCM6RfObH152BcPG4@yi=FafhV2rmH2&z(@DB>NSfpN&e1F5+ivr zi~D7dEBDCPM81|-p9upH5}3#b!!VU-ymN0U?KH%zZt1LzCLTt(6*fH>oiB%Z7=;n^wG(>i4yb?&t!qnME^h@zyC`E6nH974;p&k@6};mZ2!0)#`=q+6R$=FQ5KqNc-HP zkk1`lT?=>|mgqZ9RO$zh!pn;B zG6OG!6B9RgGqc!3u>hxBvR0MyAtU3+2V2!Fnm;~q*goq4OVY@xcP-F}<8>HoT=?f za8bMbvJrl|65o()&jQ(>GnU*z(aK6u!{se-+`I@KJBY3zSzMW0;E2)GPZyCLf3e@H z08Egfh{u{FcR^@nRrTZ2D|>X^dU2E>kEGF&9Vh^bX~1J1!)iTThIR;sHC(Vn5EKm7wi-2!6D49GHRX)AvgIrRCK^WqsZJ_;RQ zw%E(GvR8OuCaZ+;U0PFZ5PApItu;$G{Z^A%09ppDH^sK ztEY2fp4-^e{FXaMMHQTtD0UY_z;c=P{oAGdi|d9nM7E_rxM)+#@_n7_9kl*(qSEOa zG!6Ac5BiUVih%p7@K^`MVN%qgiBU}_%Z$=h@R9__570x4#gb-|f#@ccF@DgwbVvow zC~Dd}?&h8t;NA1SGFiVuj&XHy-ZjYyLg$^G7en&~gPb205Ms=UOyy-u{X@d=SdPFt zeYRsiHyGpZB?4&?5si#T1qwp0|u0a*y?&Cz9OJ`6$~?eyon8Chnim?z28C=OR;zQgB@N1YPFTVJV02hNaatB(Mjinm+0C$1lsiqArehe!7+z5p$_*ZbxBKJVCf^yvR z!7mb5(1kiHseT7!avfYYL(Jjhgo7ZMLHrJB1ZSZ^r_}tQpd?^L(*7TMR5Wq~n*FKT z$;0$LXyMa13v^?+&;n+=RCgP#OIIl@u!|vOzZ~A0%Uf#-SJ4vW{3hMQVbHN+w6A@( z_r=Oe5p*EUu#uWLiAkV%$cDybB)`;31Lp2&tdRmif%{-nv|F6-!u%bCO=Bj65-^MM zpVk8T(Xb$rs|txYC>BrROM~`@@xfLG)m4m8q~YxR-IQ^VUIvjaPh?nCc~PdD zPQc`h=qHFzVN}-~9L?GV3hP|@0@tY%mR*rG8=3_SN>LQF zS?mvG7=~zk=WlN~iNpk4{eZ>5>Ju^^QHsv=h*}{De;5iu_+V>O0JC?i?r! z9=6=GOImBIg0?E&uQ_{>2~JaxwMdsB>fiqY+)rC zWAi-5LNB3wQz;}h4C=zLg1icjjm!r%p>?)^BEn~DMvY)rv)v9mmgmXmxHAsVr@)3Y zo)IOtz>Wc%Ghs)W-0NTcMXT8DX?9%Vn7?v(o(}4Wh@KLK#q^~Lot7awfnFE%9kECI zYv*b5IQ$oe-u*EG@d>T4VLjg}XY%H-+1tc=55XVi`M!Hudfm#&IXsZ#X!OWLSK14` zl!!j%S7o4ICjR#;QrovZQ`T>Xrq`lQx#XY7+d1bS+Pf>efZ89-Nk~!!3h?oUG7bj< zA^?&U5ma$szu0n1S6TWTy?t(Xdwbe8m#&pUkGB-83#3RD(KM7URFpA%ABI|GT^5O< z4K$Rn_9sP4h6e#@c!2LrHu17kzT)lWH?@FiprHEu{K&%>hrsN0o#SL`%Ky%LoLl7i za8iII1VtE(I2r>&@(bDl#A2zoPG#GoC~) zEgznztEPr#G!mT<3fSdv2U(S!jdL`eL(NO*>&kR21w}Y?OC%ipU&LqZi}bWXBa`Jf z^Ofdha5(IJedF`E-+XnV9#3UG=cF_Q#+&-HoIoS2-%UV?;dwOOgrZ9hnq#`5_Z%sJLr z|C@E`Y469n{C?dl@9Ns(eHMZ!^w9vi{BpY=_iCoqWZu78Z}j~AbK5OC0+}3-_1C4> zRhP&86J+MK6P#|R>y{r}SW-&LaIs`k>}%V54J9@8dHUdR&&pz<=npcPbo;U9SRBp< zMV~tQUoMyHDV$D6h}hU0C--p}jDdv0p%)06J7sWGR8&u`{r#Uy8v7$L#LUe1+@K}@ zq{Wl%C>*S*smcGYlUbxY_zbO{L?&BkwNf+ssU;qb(ck8-2%ufz3HN=D|7q#NA*(bW6&C_;@2F5Tk6(NSVj zlGEb7_sZ<*f;|7!X1fzMuea-s3(n;Stya^^vi%Xe{%G751f>38J%sQ-ohQTpBlLZm zuqV&Z=~7G2sMy$(52p*5OvYmlyjT4J zDyjP~^^{l%RqzbaMxGr2;XrGYMei%-ywO#vRj>Pz@BHl#%3v@UaNs=#FhHvDsS+6V zIvKC`A*uziEnnB(beFo3IQ+QfxA5ybN<#P-y@x_jUSJcC>?TaoiJbR9j9C9-t7JJU*ZAUfDdp9NVo9TnCA} zcN!-Ki+K`&nPo51k^8Y`J;^X~W=Zvpq(S#5wPu0x5v4ZvOT+Ou-R2{qt6k<+xG+iFGMyMK)AEJnV1( z^eNwB=x)R|X)7~qF%S$LRu#M5Y^9#-ag;%fX9u`AMl0z|WJBOJSr1bB=%25HRb3-% z#iF4AC>)=d;JUbvZ7Fv)q9Wjb!0L(X4}!ebFa2wO%%7WO^3O7}v$H>~JhognY{GoD zdmek5mc@00&dPq%;9gk0{8nDu9%jJnoFeqA?sI zd$Ruf`aT5xY)aFw!WB~C^VX)q!=tZ?Sv zvgfz+TEE)7SIRK*#)bwBfLIOivDs}m39Zan#Y9Dizqp}}r*qzun)~CLS^mY%TV1&m zm}P`5vLlTa3(l9@pqWP_YgIr15OsBREvlqEJUk5BoMZR6J1~OBdavOnCqIr~dC)!n z^H1dVS^$oMAQAXV3tBLlO>rE}4iRjE_UBpw209cc3j9{aciNvtln0em9O5s`9+Jy$ zw>{I+qBcplRl*GLIui2#j+1LMd?KrWFr+`NMz$C1%4F+8@*g`fFflP17wh{MOgT!% z5DNel|KD+WW5yA^0C8{ZfKCYT^Q$DdG~h>ob^Sl1_kU-J|DDynESv_~FhugyS~Qw? zF+c`L%2xSbk_*}UdJQj|a}{z?>KNr=A+WQ&UG$io_fb zO^DMu-GJ?S*@JM~xl2a>@q0T7qrq;XJ9UzPZUjmJsbwKhW)UMC@-2(G z3s%}3vkVghAzT229Wrl!l`ojhZBJm=%^ss(DwCpz3?OC*`m#;NQ9k^RvDnIL-Grp@ z5>X0sb$w(RrrL#rY7I@U;g&{Z2Ke06f*lBrUNk4G&oEe#DH!^mW@5Hzh^78w~uYNEA9X;I6EMcHLaE3iR9 zgbi`ODeq7H7mKe2tVC+Y{XWp*MAgeTa*RLpmiVCn$}?R=%~gsi@yTx(k%xe z_Yz23sb1%?etly8)kl)&jH#Sj`)lKDxXaPOS-2Mv)DVBx!OxMg=I(B38Eya<7J6g& z4>C|v(+)GhCM%h5j9l8+Q=38FoB0UZcwpA+A;4G91puKA4{JOE|1{dK6V6nnZq)2B zCp=f9E32s>;*pou_Jj@$ z96aspj9q^_&&;gHQ*{s*`MDAIVmWeEC-P_$crJv)e!Z zT`8}_wx=j1tFF`M5aFhR=9&6Il77uyV9=KgSFBuszBuqQpex7l^J<0RBOf_*4 zdLDN+#Ok&)ENj+G*g+Te`t1?BwnHp8qiz*5))raMjg-ep;Y&)b+&R z_lZc?elKUs)d@GZr2TSH64rK|BfAJfb*e<>Ju3qy&zH#qnW}wvh@ZGzs6vym{Q-?3VTqP$2k=(TJY@r2Q5f2a)`>=P( zex>XRA|athoIVANiVJ!3V9Dy{?pyQchKJ}TqKAG!8ZT&ve`%*V&=X)V_&euUY>;Ua+(3a_MhReHWEj`^!?AmE8%G=}Rvj^{j3VK#!j z1sDC}RdQYTil{Ln$a5ory&akO3QvBz!phyY(IpvWH6RP`4~gBr8jO{)Mb2E171`!+ z=!HX<4{WU}4&p@Kl+!ccv>CT0XEAut@PRs7QeI~SYZTwXC7O}@)#16hMQ#Oc0p(Qg z^dh^HL*7QJG%29Ck{j|zy?l&E+c!C{*%Il-Fp0W$vDy=3dbw`2 zfhL6sha_F(;vQ0UbBC}SUy{5RDNS$s^Z|Y`w&mizuR32Mqvd_-CW?_5sz0;(r1x8U zI!OIHm)%tx!=lJzKZyHu<8)<{<$%`qv#EyBA^gB#<@TJ-HaTZ>qxC!UJ4-*H^Yc+A z=T2Kro-<6l);&o6yB?`BVa2Z6F9S(9H(yCS9uYri1$EHF&nKmGI=t}O<5MD?FJ}Hv z6b3f|JZO}SvYqMTKJ{-|tP$pKAOCxwuwFUTmrO|U?~GPZV)y;Q&XaRFl7(l=);vFa zX5vQoiE?#beym=#& zLx#`Y(HCcN+_tRw@5uUSocSEJaz>8wvIc^%>hm7c(*b%74T>p1b;0k|CuPrFUS3{O z*8xJFIrQRA)QyJ|8lVJGx*(~LMKRddVnZ_tD5gQml-h9Q>QLmukV|kdS|SY6G1f<# ztYu_`Qe!4h^DUB`@2D#WtPCl^;Zmqrc5nNGs3hLiqSU1rJr78Ep8h!Tdmy)*Z{o#) z9A1vU#Pu3}6p&J`w_1hXo|cN?R@xl9x}&V3PQDmRf@A&O;R(~^w*C9?1fS_*Eg!uu zVL>d8JJn{p`LLqheiv;j!VOQ`opBpMf}yb00hdAc>zLW?h^m4`fg|mkw$|*0VaK2n z zz*0H#1SDGlkYz^oS~l+?aqP2MF`Uou7q>4*xdB1dEU3LK*Fv`ixd*%_E8B_+2<3Gd zz@t)&KkBYy!iiI2a=O28Ncck=LtQydZGKZzGRh!Xy`)oM>PUmlrY(C*%kT2?5zM-q zl_ewwfF!YHz{x032l_@VD1_FD%-4dOB%Pf}Pz8VV?(EpJ7sA^$2ZO9jmMQtCh8^qOdtRhNr?M#>{j|78`v*&5I$0C%{7WMJ5L?@f2;l3B! zRwGD~?pSGpqRtFIZ_dD(iRDYH-KsD(eD^IiC{%GVksY*8UgwXlz;fE{$X)LUyc0B@*#&Th+E{tcmEh%d97GlSOX zV8*!Afy^%V#hq5lmQ7ukR?F|1_C2LN5xOZv^$DZzt-S7vJ#;gdHdmYB_H8yi?U%*f zkZWW!Xx934@6~p5A4IpXmXcM*GdL`{You**{<62__Ub*3<#;#w8;(i`sh-5NDPOj1 zJDd4V$+MX2fR-$nqX)Rs!W)(kU8D`yxXCUE6?X65^Y;VfYL5}OqQ!V{pdgMMLa6~_ zQ{d3(F!Jf60XX&C`UqRjDjm7tLb0BeHyybeL%0c*wMk$BBg=aj*cKgq=x(qAVhIY& zd;BNdU{u$65L1NdiDr;ral3~22kX#LbJlPCC4|})P%7+dK+6w`XF^_bdgaf0ed4P=&EM3pYZHxoyQ=Nd zN{#PjFg$k~&XQCJlfMry_HWW_oz>}GHfuD~QM?#$&ZuU=|Jsk6X$qR|gv8*&4m4k6}CC?LG_yV94@y#+xqYQNMF# zt!aOchFb}amNG*6yf+gT6jWHDd-of)^8fh=RCsxOGYpTa`%Oh}_#7(aYBN?^x@6x` zCN^#csHeR_)$WHdntHLqKn9n=f(T{8K=oBnaynf`8-8td#57%cW3^N>DlRT9?cTRJ zWH5q#_&VNO{=P>qY$jtHkoL4BvJDF`(R^tpVxr1SE~ZF^`IQc@q_hAPGT>B~Txt*j z(P?lk^jKXW1P9C2I3tf!#}bm)GjXo&dfa-s;dF0xZGUtpo7|RYK39QCyZ^)EF*C!v zy)|L%%SRc?Pwqk8d}FWXHX~AlBRA!5X{2JM(V8wZuxE=I=JK+jm!lIlCoMO5qih8^Wfj zP48cG#|A&z3(B=#nCQU^PdJZ&YjBsNjvOGCxSh&lloeVt$DjH7$T`^}x@!(Y>xoYm z$dFnKpi^xPzZT72j^EE;AL_%*m-jH~Y%KHlAf4`aAnIJ^HEeyD(cNaSJr1szU!Tf` z<)0S)8uI%F7M_$wwr;WCTCLj}=WEJ{?1(3i|CBOp6Yfeu&6&q^6#P@2kPeDoYZg=- zdh4L5koV7oxq1$wqHsAGK_dlaO=%lh-hNMhx&=YOZ9R}L&!2mSfKY9`e{^X*L;Gto zwwvbFlXuvJ6^tgm^A|L;8Li>ziq%?^2_#{)eMi^g3OIwT_@Mb(Kui%rg(j|2w~&>R za-zl79r<=;ohz#RmOHVZhZCOFB=PBNE&t~_`98&j>Bs?ldiy)ZRdA)|_)g6??f%YN zqHGELyf!;|g)8|apJzf=!^pkjpsq{kO4JI_1=HQ#IRbvLGk6})6S`h{Z;+H5c4!<| z+Mi26j5uD}fiisUa=X6d`RIK_S&ztG?nLfM`Tlz=PfhYGCmR0@4gJ27kTM-??eX+; z)Bdpb^&V9I{>>||!Pth*BNW1pH(!o&H=I5Sd?7Prg3C9U z7z-=Z(Vt)Id!Q-Gy3O(IWb{Q!++%Ggz<8ZjC|g+~A!Y8A=tvP6&fM2rS07UuFYw59 zfvjw}w(fzwdd%U=l6=|l2oAIx3A;-duP370Gthgym#sV>eUGq~X{+{TwF8(txs7(d z(Hk>zLQB=AZ_%n?apk{S(`2(I>SD~_^xwH5T6xUZU*c3s{%t6nLyd9}KxBY(HD`rps+9fY@P9b_4AlJB=6|gkjo*Z`b39T}< zKjWbDLV|E@w7*;EVlv`<_4OI^5^pygzu*ftNYfpD-BN-tKUp2VzV}<<5oPPfWPfxB z9mcIOHL8DXuHSsS&JodnAyKxy4nUS&x_EDU+Vxm`eY-zi!Qabn8(H*vn(ANw0gZm! zm&|=~`eh2V-rwuzg==>a{`Vrn&cTd-XP4TJI`{8-Cx3q7Y4gW^%DIIJo6dO;%yK)z z{nIX$#uMFkhY4)0jqAM8W)_dTK_bl|LGVjI7ORMcHg0}hQ!1LpZE$jce#WB8N`sXh zQt9c)`TfrZVUptF`^S!{mmomVD4`QdMoNbTnpNE9{u7z__WcuMf&}9M`PvB)d3QH@ zd+Yb_s{TWVglvqsUB}(%hs5kefiakZl!)rV1gQdsGTAt0hq{D%@u&Gfp34%bWFg zHG6PnX6MhAHl68-KcDmEVxmZ`2rZx?iBXrWv8bM^d<45ID>-y|TW7OxdUppC9v)4& zbUBO`z+H^r1;l}WNrM<|H1x8j@68aI#IY0ce zGAh>hL!r(HUv;$aqXr18FFSY)~~Z9k5$P+s)9C za+DMklY@hc!s4pPeAhi^bwyQWQ42-jamw+kPfyNT*-RO4AtLk~Ua-R_B~|5^(>exO z@-P3Xqf73!HXHJ}xrE{p(z#+uE^}EAQCh*nV%?2Y4jlM1VL^rgH&iO?gCPvuJ`VA5t(Y{5hR;o7|OxnV* z(HsQ9MZN5J@wQ*}Lt-we9T`9qV!iroq?5DCN)KJK^tV8R3B3qs-c4XpS%D-cuQd2N z!FK|H0$e=BBqRx$=`yC3Eg~ev3(pt#7TYzTf^ea`#oPEp$Vj3>N>r?mf*-)xY1|;x zh=n~ZsR{(aqo+gz=ff~yH|cURgMBPAunQ5p&U^NqP@0)<0#IR-K}<3-VLt|)4L2ew z^5i|$!mlgth8|5M;-Fwz3V7Qunt@S}930wEPWEtIRZorHs3KybL<`F4sq*hQws8v# z_rh6$ybw4$Klu$S+ayjHf~9MFqaysi*}rpc>1MXwc+E^X>ZMbePuri@hzDV0akKzQI>KGwQ}im|Xi82wOk;6O^dj!@E!1DsHjkk3E#9DB67& z*ceTXh5ctPx|6*1COY58&lIZ-kulBciAa>!c!Wa^Fd99pB2<$T_U^nWs*4HwIw3ah z{m?FtzCsg3`8M9AVe@A|uPL33MfRPZy-kqS82Y^c>mlo3<5|R5$OR!PZ#<6ar)O ztEqqncsYs#WBq*N9y)b$V{(a__*+XPmtn*@UFPWVSjx^{2> z#)AVU7^81XsA-98yXNwiYcxqiLnv(4>rz+K-6*LlKZp8u?f0ECFiHaqFjlpY=l`~{ zpr)w4blGOIOAhPn3W`cHvZ|_bz%j zl)N0B7)kYnf`XKnD713LYYylF%qh;PB&Q^0W=lvp{)C3U9U2-jw377};(=c%?%9r8 zI5fQsg`4l(D|Q~V^Sux9w8uhYE#cPe{j00z{$Y}e z7N%f|b-eWf2~o^WqnA%)zCAIXsW~}LzcH{k+@4N3Ws&$ZY!uAdKav+)1l zny|Y3(aMyKO2ne;dNFL+@eay~N}E5A<{J`eE3c#()K?W6tCon;ruw?ZkKU%zj?*ccw}9K9CW)dES@`vuQQ1E-E|*P|44z<(;t7zn6ZC8_8UEo z=rdVTz^^BmKgvbhZWe5Hnrt< zb#+lqP3&T_@!RvIpsWXD$*b3F0MMKwN^smuItGz9-`>7q`Tcu&dG#nN z(s0M7(4Nw~#YO?I#p!94elL7k0R=s!;Z~+K)N6Td4Iw{$TynDU-kuR-^1w11`~nFX zS0rFqRd;co0`LZO&3>jV_`iit9Z4Bj;=v07+Q1+Ih^cBEJ`TlAClYau^!x07T}k@S zvfO``8DZonPP199322F|LB6ysEvvH9#$@D(k8W&qfoJd!WB%e`Akqxe$LE7nuMWB?w&brJd(JMOqzGl9M=VmDrYJb{SsfR3FxY4rFIb( z4X!r4H3JN|7~nz-DE5eoES8I*;TQ5Hlh8P_;qUH$%myGfKR$|xzd^kj0UC`Zr8T(% zWAcgQsp-LBhI_~qG*rZVba-LAB=q!oxZI9)Rfu}ESqH_&0MOH5tc^B93bHV!^;%m5 zZB}byda6*?)1}2+1F8cwwDm@duBY0+Avd{eUqc=A8X<_wV|u8hu`!sI)yEeX;K>;F zu5~ED?&DW@bp$mM^mKldK4WyVDgfPYFXr5f=7>hd>p#X2Wjz5 z*m^rxT2VDTWzC9`lB!<}2?nCPx?C&_C5OA2oRBW(twW27nwo*Zo&zWO2)%*Aj-EP= zj+l})<&v{~zVY8=nWG*QO+X=pT`M*+5-^cA#3Iv+LyudC;r~m{M3gxc><*Zft!imW z=@{}@ASHm&W>sY8ELw!e*zY-d)eHOL(2-9Z<}U}XS71F^uMR9~HSK9Ybq$EEM$h<$Zh*ZMbJcNA#~p8?2L+M8w4W)l^ggo~|u#VuFgKsJFLoBq1j^ zB#r`@Fy-51bBt5ZB45fMqqPv#dkBvm^|&@wclkx=~qBZTL_sv9cZzc z4PIG=S))(}RORBcEw_-gdxl1UXXrgwE{#?n?4?KFQ`LWHfovS$ANh3^*}nBlGXV@&2ryvtn_~)aeo+B%57-bB3Kr=2zce(c1Sl{D<_TeJ%60yOR3JgnaOnpUC5$q^1d>77eN_ro z0-zdVs!`!hes$oaL+mmX3t+-5Fx1if0OycFu0|=fFvKwB@V3C+=2^F0Rh9_}LkX~- z9UucZ+Xh;*6jD}#?bZF zskBN6w?4w6^NT}4$^ZlIz8(lPL@0#Z+G0Q7A3PLk+q`Pq;%DNN`hQNW0HXowokxMR ziWr8IGC=Oxm|>8Ct**D>)+twlkm9t@*lkw{WvZXDXPscl*)73PFvr~v3=47-UxYK5 zWWdUW47E@=W+C}6z88OJ0J(rc8z9+qGCuYY@}R=2{=TUzC>TIqo5T1WI(`N-XkVBd zQ4k%92=OZfGu=1{osjw<_mv@jQ25?hTj7t>wGJ-?YIa*|DD{69gV+m@-7m`Difk>DB&2MqFX2!;a_FfhNDuGOV1XDA zC@5(0sR?55PnY2l5ky2>SPLwQQby@y060U{Mn{lKR;!YhA}Q}bNKv@HZQpts9U@6t zT{uppgj_f|D`W1^i!o8R9+9{0g{t5@Q=+6*rj&^)DmW>4aX-O6!>m%^5O28sjx=`MYs= z?7>rFvSw0Ui0r{;x96h!;$B7*56maZZG%vYLR#s8;(w9y43b9l19QdU{4l~=vn%*7 zrq9?zK;WmKfco*x(tNkE&MkQjE1uE(eBw1yD2?SL%-9S9aD1y3Hntj#(T0nk!9_~Z znBFtJ+LA@|19SV{JfZWL4CylHk{5g3OVIb-?b%NnAmU8dW8L9!!JP4M7lW15#NJn@ zZEp{@&S%}ajJ{K1`lCYNOG$=_wcEpuuG=dqDTE$#b*k>#j_CUtbIB&%fo1S(hR09U z_dKH^*S#)kvH4yj2t_ekaBTG3xefff3JUMfiH%4>bseEz*D1+JS0mLc!_O`^53?h( z3hM#kgjT)@PEkANm9?-&IV+*X+~@S0KRnKzKib|R37g~{6}zoCnaxzkIyL{*4Jjb0 zk=LWB>Q8-NcMjX$W{^{tY#+Cqu+v}n%Gs)oVc7#%Qp;USH>*J(w-c3`t*;)b$+%&j zNxE`R$I=vMeDO6lI8|D>BJFTg4LfG@P2DPBUBxcF>D0BI2_542hf&>FZpVtzxL8w# zD|ovpIgjack}Q)CKiBoqn8GjF1AU#$7!K|13`!7=Di}3&daSVN>1(W^Vjvto=?Ye= z%DddZ>70{*qo+F(utDPPhQ3`5I5U|)5ZIYl`J?>!Z;3iDSv+-9hh18^UPpuM>W2~1 zZ7DSVG_`*hw9OB!6yg)te)0BJWcNwyr?O^?C(K@3XMVqn;&~9q#ZQLF;SAvWa-$p< zu6Q^uvk8@(F`b>=OQ?Ds;L-xzI2$N-Fxot+G-$d=Iap9=hx+9a)d*vWy~o~D<Vw#vyFaOiLG(7q_U*$%Je;6s~6`xShnE@vssJn z8>EUA=I5kg>pyGK4i<#my$rP$j^637RsIOth3J*wBm{eG_xuM$U3`BU(xB(ZV&Mv{}Px;A5)TK#LRINdG02E0dG;kpQ6vKwYE-7 zTR-goy& z?}PiWJ8rtD)agtP*!Nt{1;U-K&OIjxI`+FvdR`B3YAY-}qw`@hBrCsfiW^3Tczn$N za`OZQ2dp@J{sqGSK1b49)f2H1NaDHpZYv9OkZ_r4xd@6y>47@WLf*1D&nJ}oS6hB$ z#|~2Ha)kdD-U}X?$eW=?=owi7=5Jnt9GD0=KHYaB&qfkoae9x}Xv|dA7W!2@*VUeN z`Ge2MMvwF>9?p~tvwX+Byx-BaMz7E8x@&?NLDs-Wh2FE7x1|enfhfs+UqE@p#Pp|b zj<~OCcqFe^d6bptQ2=>k3eR7Db= zS5g#n-+N#4Z?=LU9ql4Xji9FsSyaJ3eE69(pGfyPQ{tCJFi9qBB%1?K6g)tbb(PbJ z*y~MM;>uz}k0W`lk@OZyfU>hM^d^2#XKIC4!W#KPr#oh!Tvzy_K_>x-D!Y+C?mX;v zZJm?8bQrrZ!5hmOSizQ$+G$q3&<96#gvPahteKR|zTY7=Rceg!FE0W|76uw-cX!UR zS<+%x;0(ESNAH$-5qx(}TQ#0fdK|!WMMZg<-XE!pYB1)s-E`5lEz$i?lbQ#w(%0?_ zkzGKb3ZqQyfID~)1-D+rJ#q7#XBS(shFPg8`KuwVA;!`@B3GQYyh_NwWb%5k-Vje2 zH*GrH6C!rWgeIROl*CBfetfIAsH&dOdgo+nXD!zodV^jOmfT2RHd7KI(r#l3({lHi zoc8Kmwsm44P)GTGC)^Xum$xHtE*DK_azCK%{+g5nsGu~o|Lac(N5&Nb?O*xx->_}q{{=4of4=%(uM0sD{@1yC!G{3QD>x8l^}3`L z;I4>5IC1`@vIIlrgDp0xRU2can_K1<@c%^)2j8xx(Uq+QEC8dOF^)q+D2J44QZG4> z0!RXg#et+lltLS9eqT#a7XRU20$e&=ne>-Mh6|ut{QvR()Bg%s|L+szcKu7jxh}Qz zUT&mYY}UqdZL)eEcdn+^{$TIqnd@uU_*@a2^1Gp4cJt3sJ3E^VYyv_l$sQ!D@pX?}bhCvQAP=AOUb4#$r{$fe z*&gYibaph=VV^1G@;Wjj&zzl+W{XjitL+|qad02yN|~jm=ib{{-2svK9a~wE`CH)o zFUQ=>n$4zg+{-kkbDcAe&!RRFN~7tx^1VUeR^P)*(2(ExqE~77H@&LEW7E!ibsyXr zpEI4WQ)30N7aL)|pfjc~;rh3o-1sKzZ*Ry~j^}3ElD)aSr)$q-+jMok@8bclo9u1q zyk1YmX4eTk^@Ue`!cNyFziM+Ic#K%+t?Lea2!c80K-G}7N^Sl&&bTVM74MwnF6-Q{ z3iALO?o)t-@_vkJH24eyB(}~V<~DP5$R35sWl6wzR%T8ndpeNTc7D2c(d?(ucE)PU zbp3s4NQBIvSQAcfeJPuAr=lj6l^*EY4iqimpzmZhC(-sHK-12{s_RhhTMQ@jI zC+Q>|ckHCov2EM7ZQHgx9ox2jW82n^ZEMoMnYU`*Z|0A$YO2m37pKnIckg}neV(<} zvo>LuK!5YrXd;!@+vEECDtg7HvPdQiy`VD6<=rUJUoZiSu|7_Ry_fDcbZ0kGNP0VxTRKflL;c?BG z_s8=~=-vbVz*T`Da(Mo++=Zt%$?0OH!TZ@#s+&HH79?+vGtE@BPVZcD_CU7o2Y&gI zNxjX1)({CZ+>keNr*ZQWf z{_(0RhU+n|)UzGQSQ5=nxp^#okt7i`UApejU2}DDVKcAqs|BHFleN)Uy`Vj=N!WDU zY_|QUTdZ;UVvXU10Kn}y7S{4)eXA(ioqCfc`D!{rR;|$lw-sBZ#^C_vf|C;OKJvLF zg{cb&MY6G(-eTKfCK|uP^-$eqr*bAfjg{Lto~0R9DV-MWktT~qWzdrxnaX?1t>g2g z64K~^f23F*RQ-ATlU3K9C-C(?ck2(#(|z{Gr0JR^LM7dKM&FokXWZB%wpbUyl)>o9 z%;)v#aEDjqtg^$w8Q_@=yxbLwG4R1Ry*kt>ch_)?h zbhNR9*$4Iz;cTe;w%YiuVPYQFDQ5MY(fy;UHj1s7*ZUP-@2HTK;d){pWlWdvt4`%* z^C7gHVl@g&!n0a>M)mT#r|fqb=+>@V47?T#L*_I7c)rn6v6Svs^b9%^`_*qP?WbMd z&q1<#9^V!t3_;t}2wwt4Nh!^yj6PN+*H-ow&;FLTG^*ePhtNv0q3*&2$*XgCD;U$BnU#D^5 zuoP~IwdilWo{zYA!i}HyZ`}37o$)_^KtX{B{QA|Y%FhQJ^W`&z>HQ@Uowg5lcBH+U|<-Wr?pfKZkfpKk+3k z%YrM!dFi}?pVtE?WD3x*Zs6ay#Ytv7fy2DzY!WP!zzZ=2m)x&`g5xb{hP|!vj;WeyhJ_@eriPL0Q-#jvR_YcSv@MO- zHK8sx?jFOcae?^T;KuF?k;Z#}nagivB!+5Nd-!0|(T*EgS@J7PH@%)!^&DwZl8?h4 zYD380&lQ)w?r9^Es8AWLhp#{3t-iJPa`vbr@tL{{)!iwNrblUMDm0B%SvEd5+!vLl zH&*#RFdIYrRX-RBty+J`ureodnr4^SXbiENttMvmJkVL--CP^xveH{;J&U(t4P`!9Z;6J2gx)!_M)`=CZ0BcOk6yb~ zj||_{IqAD7gq&RyE1XTUFSdJecf;#j?Lut}SI+}Yny(;A$)_ zFFmaogQTm=iY^Hn8t;_${n@e2G}Y&?G5&<1tv`eYfxNC)KhoGwyq1;b9_-1gL+*8a zub`EwDWioQCWTlV{fAF)F}K}XDV)988fST|ozu$rHr9;yQgx$3e8bNJ{AYTGPuqp5 zv9#KxLwvW)7X1Z+F;YDu#x9@K9A#NX{Y5Gt;y70eQ@@*93`Q~j?IBDdU!B{3ss7w(UWwwkc})}FzLIM;AXK$wuOc=-Gm)7JFapC)=8;sb z2i1TlH|}(^d?sO`$`B|)yekv>{kWeeKNth9i=S|Dg4M^i|e zFufNy??M53I2+qAF*2FHK~~S&FR|jZ*kU#7gxG;k!eX$(I`=uAk(Ki-8&`kvn&?^E zlh}amXfkX-r3TQ!fY#Hpky`^fFKl$_y2>$wiuhyrdd{1#;f?F25`3@UG?V9t<+JjO@7inS#*di8EBatfK~Q?TJdhoc zfo5e%EyhR0RG%WLyLGTLaTZ5SOW&w2yw0mOC0yXprNPsKZdZ-55}T&0aLs*lqZM0* ztBUmc7O_!}r>^hl;;VJP_xoNWa#dM5lR5VeGMcm2)aZg{__FVx<$fy#cq<}e5608{ zE#O*nDDbCiilGYbofk_7R~(;X?0;zi5^QLfyc6G^-0I4;!o#Trz{WF&>|9eMCwQzx z;}`vlT?*%3n@evoE})$SKv3c(9LD7-oTtYKpQo(3pJX##$-bB|IBT;t$ri6W<2^&y zo87GHWyViQ7a4X}!j+rH+xvF>TSXy?0hRZP&;38e{;HKzC9SvAu#c>{D$GM$%KEY~ z0iKs}uy^!&4z~P$>N_>c#SI1Dt=#)@$VCK2Bh!bxI}bCzRuwy<83+J_M$A|Ai-l9O zI?dV=B>4Fn%&dE#E7%1mmDQBagWoAtPr7OHF3f~Lkrmi#8HO&6dx+?&S~;XVjI|W_ znC~)=gIa!)b>~c}a=HSkg3Xey^EiqEH{r6lVBwuxEQ6Y~S(EdfkC>c1m25-6%ou^( z*fjew018flt(KuupbQ~Ya}8GD2JhLtM-SKK z-f=FJD%=;1S+gP^Xt-9hFxdp|;-5K~TweGKa!<)?uhDxssh+qLE7`aAyd%9nkuL{t zj^(pfZU-}$Kfi_gwJmXb;8||^Cfd3rPKythrZnIkucFr%n$K4Uxng?$}SPyh)$?s6l{=@OFz$8KG5i1l`Yv z&^H!YLW-iGL9)J1{?aevU8a}$&aH2sqa0<}| zt|1mC`3lA?#}W}wsFsD(b5qT0ymObW?z5&B(8Vzt*QIZ&Z8<0cc)GySvRl&!csykCBpJG$(R`)_1}AnbPY7uQ*t4dY zqn|{irN}M-vY!cD=n$Hn1$qP)Ymt{5&0;h+GUN}Zk=I$iw`aS^$=l=~OUI`oS?JcU zp~YbUGBZ>bq<6|@!uUb%97aFP;97u#-6P0HE$(RYwNR$sTrz(W6#Qc%hWx_0+)ZVr znuHY4m9(>pYz4nrueIcmpy@TbP2cvA9?3hV*XX!pghh`q!6&RzepNANKKf;f0K?^M zux6vSRB($0AgL_f8?4hcAlV_)Vq4;BqKHg%$48cb4lmnh4y%9CmmBP!E~emorb^F! z_H77a*IEo9P)X=^&lkTUemtniV7;~8r$RZ=cNdlC)Re=wGeKfMf8r(C`xerjV2 zHeHCf6Ck@^%+M4}ruUN0G%ij0_sDjRK6S`0r_6=%%koZDzCaXJR$X|Nn;QQaG4ptU zGC4ocDx)IaOU_cZZ94TtBk>wj{Pam{Xil;l#_C^2FP?eaV;HohfWWc?w?6AHKyUxs zPLpwzU`3(T*V3wKII5sH@|T8a39U2Wu5(QN?NoN0pPxC6&P-X!oFfOgVEZHUoF5Kn zVlQsY{o-)<>{$=g)#ga3MiG-#F(&Shia>gCGTmN?$(_%Yep`qypO8M2t`yeDXb#CT zs>z=nCrC$h?hnqs5;7*Nm!GbmKL-L@2)&+ii&X&lGux!L6sLYU8geG6UBDeLx z>E0j4Qt3BOKE6;B_28w8i`l_POne}myNt+{bQ5~1w&;w7r#diFnWBx))qT_=n!>UJbs%LC08?m$ zvoSH6Ja{`2k?(v-Q71(A8jk`or8bW3AA^FcJ+-E|xt*MGl6qI6>~;72Yt#K$^!KNs z=zg{A%*F9l+ogH|@sm5ed(b9j zRQ6}RGfga@GlHuX=492tY@||_+h6}y<^fN9$4G`}KpEbR#Zr8T-}UB5kacmL;F!M) z{ouxYS_`cL_Ha5E*NU}mduJ{xE8mm8Bh=LSTwz*!JmYfW^T20nH7wtVh}iIOM^vqO z@etP3-sYple~9Ok)<@T8q;BGsy^RuQVFc{52)EUEPY+_@?k{UYTcA0@;MGT6XMqVm zA<0;f;wJv_yQyq3BnhM5Lf5id&O+%1*3FqFk;=G{xDXe%4@L3ZM7;a>v$siQJD2lj z(e||$+f+KZBYG_lLl*ZMlD(a6knI`)>@jbK%B%oczq91b{mCSnPY;0tma5{-`3J+= zA?t3ZPVBW|ZNku&xYIl!(nH5s7+f0LQvw83)lr9J=gMrau? zfRGG34U3PDNBMH?(E|T^`ws;JGB7q>dJ=xil71^-3VMqCQYJ_cd`Tvp`7Hh)EEd{; zmTN&(kJ83+mbZlyj=^k=U74PjM=|ZcIg9@BZq)5fU6FG3IRiDX$8+lvy(hNIsT%jB z9i{#zfp{iz*qkVQOUz}XH^VYf2A3CvC|Y;F$(C>8#id3D99koa?eT5e8xiSYRDbGL zjcwA<@MBtL;f`8m$EtmJp+6(d@eX6%^B880Zr3t1whlZ`d8kJBKO?8qyqlm+b)xf{ zSN{acI;ZkFkZ=jwbZ-fBTfRW=Qx>Z<+;NZW2pTh4;)XrTRy@zhiqx3QuvVybq)d3q z=;1R2VS7UAl{F_Q({z||pbinPV8#ih8WGqJpxmC`0oFMjc~!`xEDOAtV`wvkwq6h8 z3&f#d>?>P3(DNb!dJ364MV|H4FlAPbkKu^WbuS1511!tsxMa=@#|TI}hC-0G|L_S^ zI_0%N%(?U72Y6@7OE9vdx$k8Nt^9F6i56UBkbu4+pUb85rHs?@Uq_h-m1T||m2qYK z{VP$MoTkAX+b`W4YwfU_WP!l%!P{eIv*HgfgQ6lbHO!nZ3ZlrZK$P{&!-O3?k-4vVT-} zxgyGFyQIgiRWRv9F!Col!|%VPRCR>p&79PlZFW>`KRORSaYGRDh24qPk_Huw%%su* z?@$gw@r^pW0k=$612YvYbR{KUTGt3yPl39{TH_fF3Hm$=9;X&}BI}B;dQ<~u_cT&! z54fVwAB5ORHpKNO>(X;2r`E90lcXG8m^<#uDV>7H9C|37Tx);n_zK1ndUC6V#^h@Z~t~W z(p-*fj9%=baS1>$UT29=`4UF#@Ot$;6D``>cG3a{-=*`Pftf3B zIEns?Es&3$H(1D=tvWSm>a@`&*RPIhi0%mu>kd*nmB-Gn@m!9+=v>Ntk_I1OkH|b$ zh_@G(Dvksu`n!^XZcEo&Z!Z$)F4@Ii_$BVKfBSf^R!w#5>8pOec7I5DJsV%x9Nuw` z6)E10F|I%BGoj_R=D(WyrC!ih?#nZT#z@>m$Zky6GvUPrN@( zY0X8QvI38)srP5!uqeB_;L4k)>@VE%xkC>=rRJ}H!%DwiZG$Ik{;+>uyS#(0`>k5X zJ{f(H{{nQ|OHMoP`K~i~ARrhor;+lt4mA4d2w1E`t!p;-R30GPnxTnUHpk^^@!q+DpvWE6zOXj=5KMaZ3+P8LAo)#kB+WbM;WEJ#njf zKR`kQ@%A=slWNb>G1qt65|@gm2-@lZOJ#dk>&5O5rj&wN*?oVrlW(5yY>XzeCoQ`& zguoj1F5Ry`(G=%DjnSwydy8YiYi}co4_O@5f2%e0_IK9%n(QXwyXAF4Rj!NV`^Vlq zWL&B@Inh+Zs;b>iB|le9#!Ien*&^=u>FjiEjqjwwACG??-g4az#+Kyk8eXtw-x?j! zA9OyWLSoOd&T9CtdJ)ZiaK{deq1}$~di;4jzwNlUL|Y|JqWz})szyheR8w02bdavj zwd}-OulpLYyk#w^WQY3l6=n)Pe|C3*N6 zpI$-feq6e8M$P${I2uC({45$L`l|8rdU*SWg-z1|H)VxS_~`S7+-3a~&e~3LbNrt< zVf<2df@*{xP0+5*D-iH-vvzFms*ra}(>JmuHOE3t;EtQRcv9YRvzKr5aKb+}7$;<6 z!RFznPciYUxM9%%)##7n4ESqW7dFF`d%XFaf0U;a--Is9D8mCHfICJ47w20iTWqfe zKh~Ta1QxG=H)|FnIk;S-6##SmW=jxVh>wlX zB!*z^$(jBp(f;DvCP?DpNf@N?qczO-jq=Xl+)W0HoymPwmnGkr>?H<=O{b4-Z(md9 zU36oZ!i6#I9i1?WZpmCv9Ai84rQPCU`J)H6?TJsj*%dl-ndSVz`ov%`O4R0o4Z;}X z!nbTj5}KJh@CYz%WqpHR3@Uci{o^~4m>ct%a_DZM_KV^tn>)^!s;|(%J1@ijU{ML* zt$1^-Rj)}N0}}_+=Q|A7KqaRukK4gz5g?ZC{K$mFHY&$$Pi&p$*BIL8I9K;5nncoQ0t61V&gg=_r97P&;$Uz_;`id`j>!$ptu^ai z;(XlCLgSE5nmlk@+bLny!CmGd`qBGo7Hezh!Noa!(v=VoU z+zosjQLqrZ&*qzW?DlkwDb^co1td-2+A(bnJ~cUiD&qmCKE@N$b|X}pyW*-0IXNSl zjIv%Bj2`egAPnq|AfQ?@$j*mljU6LO*5%z6(zoY~>B$j8}KfXBdB?CJVFM zi~cPQ^NK~>*y21iDDssdHdS?5Q!ogp<>8;5=b>Uh#SA&v7+Dw-6Cdp_l_moTVdQM| zG~;}O^_=t&_{KkR>e4m~{ZN0jJEe|>C+We@uABy6!UQuRx~tUfP#|1hRGcj3{MbFQ z9b#JZcszvSim*;r*irx@ink{2;&qRB>l6Nqr#=k2JOmzNZC@eB@fc+6r`Rc)Y1)Mn z0xee}(wE!DK}ktmW{Q~jF1(YOgUK3M)_E&IckgPylT|}m7UQ#LmS<5!lI-N}J7=1q z%@s=lhhC}lm90UEvzO~YYNYmmI#r_ui~UFQ-hx#`ZSif`$#HahZ1!=AcX&p?8qktm z>gncveiE#3kyZTAbe4hKVe-THB(FLZMM;-hgnk5077qii z(M6&258S6ujC-r0o8crZ$E)YI8I{4n9ARp)rE^wsnM7te5;&^ze#Ouogx0dT(c2Ri z?T6Xa9_t|^<2VAVXYhPAsl%mh(;T|wy-(6z2;TC%V^VX`6Rkrz^VzKQHNanI(sQ}P zhFjFeCk%d40<4*U*;RnzP~G-<@5l9P_S0BeRfgG0m#=ir=unsL=NMj<9M=zvT}fjD zD)QD=l)cR7kw{(v4*v#NhyEl)L4jIc{S8n%C6GW$e{K$-wq^9!va)Z$=@ZuCh2INt z-`f?3J(=}YEp905C5hn3)R+}lO%;w4F*%TbYUj~p9nxM7L!=_Yo&T(rP#hn3kITU*Ji&f3eImTk& z66M#zD6F^r`*?#?T*A+m<9xC{#ACigJS%t*B`K|?GCJ^E!5*WxMK2@?NLjJ7uDkGh zYr5^2DdbYbJ?&Atf0ic(35wF+w`I1sL2TRD^5te2UJp&p+fh!ou765KENb5Gbx%~`zG8hX_^ zNBo(whp#ZYhhIq3#dGm+h38r0wD!Xi| z58-=Hz92PG}dt2Y_Yyh61grac8hBbu7;LMFs8a%b-z9bBDsnh8fMt9t(R{MI%u*^O7K~omnQ3h2#hv-KOG)lw=z=)0T(EP7dzYGT+q;wrSq^2IGo}96~IdL z!@6rbtW->KoEWt}RYo2|MQ-W&h_P=Z>&Q~;=(Kc(D|kqZ4C0Zz-HV0zx066MD~unw z>><+)mu{|;Do8RWadn59o9b>?y@@nsv>+c4K-Y_HAymCFLWj-6ic!E{kTJ1(K3)oV zYf=hXFsh7YhIDsL%V6?>$QbRk_*#4RxMwW0LZY`fcF9-`S~)0(!EI|4*Zaifmt4jgqxpf<#bVbk{#+MO zFMQL_nk=ZLA%E1kNL5|Nm(EgF7m!gGxUYN0HsxC`wnmq1EBmgFBD)vi_SPbT9kS7(b0DG* zGhHLyO&77Ho)!a4hkxQ_u!Tgq#^{;8WF{28(4DjyaK73c z`l6F{?mN|;eS!TuHLW}8x3UtM1SX2C0`ND+ zju|0a^Hnq!4i>UnbCI8_tSHGbH=HVWJ9mm$?Cd^Dtr}OmX5gNv>kR(6bh}^ibXrP% ziIW_(%yUeX8BfeBaPRJ7TBxa3$s%QBSjD~kf2*n6`ge&HTlq3g}G|8J{4Cb`Zh!kf)twJ{ooca5#XRjS>`avD_ic4-|?-{0)Sus45?dlJ7 zNJgbZg#^cphJ45{>ES$uc-((QKTp^YRLEHb*7l=pVj8u%i+8AE5FVJ~*uEqjl7h9j zIqJn9PB=U`Yk!UV(Xz1rC@J&L(frJ4(2B9%dQueNg;(qvAte! z!})rVVA2=ZeDx+V{b;YVwzJVcYcof?X}-I0Dk63U>E>5_cRC${BbczOohuy{KRCLu z?k`xH_rL@_a^Lzfz6Q{iT~o&w{fAd}$j^*?VHqvlX1ECixV2Ty9R z&NRd!i&$a?r$UA=JK=oR=9`&UcTdD3e?KCIRC_!}lgZLXDKc@wnFeW}cdpRD7gevU zNJvf;k$@!|Ep3JYv^YEdFdX*I9MP=(Q=$ly^D^_kxn{S@9V=~*Hed9P$=w?mRN3n0 zYUbabkBdU;XtstHW1?A>ZD=DUmhIC3bJsHht85IuhqF0e)QP#gcl*zhRLkG5Q1kze zI0y@*#Y7Sh>q@3pa8qe+>hWPOQ6nUFKDXu&syJ4TwQ;~-!y=59ZUb|sP`s%+y!Hwwcj()~zn~Ua8 z5@LGY{-Q{#AS~3%l~2}pdXUf`qCFj^QKV~U>K!VT;1U0tzCzT=UGeQY{3?4AEMJkg zw~{VS?3)53cM4xJB(N~vmn?%&egDWzZGmq!i0yB!C3ono z13C35iSd#x&ggBPvu2kEv_Ma#G}+G5?(`W2B?C$zLKQ)T=Z5G}*8T5mv6S%>Tosuq z^fS`Z`D2qVRCt`ck?J=OV)j>8hw;ULMd}QBIXgRtew7p%6B$I~!eA65Ji-gLrg@!z zRX2@VsWKNH;47kr!!}E?e{wqCTs&4Y6OOoOBy9->!WZ-LitkIiC>_P&b*FNzDoI#0 z$i^vo-gP3%No_3fphzh#s7(o0NXL$rhmj$Pqh~p6^?Li(zyi1U2Bk6G7SlDw9hm}7 z!b8#b1`7>a6A~3p$a~++ny93^^{xv0!u;75QjZmu&Rxx(QT7(fu4f%arc{62If&*4 z#n*@IxHge;pR=V7A&W_mbv4|he+>(f9`i3+w&sGRFu*dt_COJltjD~REtgwr zFRGu8%uUih&Ujs}CM7u~d10B1WJ-)q`);!X;%TlQ^M|U>)4AF^GgGoTQ)oo50F{K| z`i9bQnL1Qu2C&0{j!mxAA33?j#se%KcQo}w=UWNJyyDbSZ9!=L$(ouMSlV3wRJMy? z+Z??ivgIOPk&wWmZdF5r67*L!N!5^F;lD-=^S2OJn>DUcY4XEh~`#uZ$_Wz)^wQYZ(P}&i5a`l>>pC4C%$EX!dioxTk(j56as{Y33<`q z-rwl(xm9GTV`8c($y7*4G!{e9a5WwFDr7E_tv4zX)tHb?6e~&7wC$UCDLqT0 zuO8?TlNIWFMRYr``Q;sYj-MMMv>1R6BVmySzP-^=n0Nw;p=!WUBK`M;FB9m3pI;a> zg`GR6Fu6>_*;W^c-2U!X^(QK{DtazM9HIR_(>Z+*oiA;McBlEKBb|O$Yd`KJUpZ+v zDozZMGF0KC^aj+G{m{q)GHut-UWmKj-8vwhK?UBmO5g}NzDs&vR;6|iR|8$znqK43 zX2c0eWNuI3+rT5g%*@h{(V{Y@2W$4A!snkMTkD~V{?gZXH@*3_y!^PmSB-NsOy{$U z6G`GGNl;xZ)bTbTr&b>9$Av@{x?*_?0n){jce*mob_PSxy_N5+`d67w zOs5HlB#v$qEby6!G@PAGG3R5}4VN>)RfKIovpRYCzp^$b1Pm1ml**}1!OoUrN2`sz zeH;{%-mQrTr45lx*C{0VEe=5QSaj(A@ z^r1F(!-nVmr@#-eyfl({j1xhXv*Oo&bYW7!aEal$WJS^{1!<*ZKKbN|D+0+%I&&enk%&+%lfVy8@NCE@%b)bQ0T?>0sX&%DEn8z|4GLX{G(&K-MFhWpss2u zn40{nm3x+oW|zyRhas}k0*X<&oWNbv73Q3h!E`Hg+a6znJ!&X@pIt=W-lpf22ZWf(FJgf&Mf3^$qkZJlVEXylP&2Q&RqX zsQ*Cvb^$->T#4g)NxaFtII~3ort|FhLZjio zD5fO@G)X-)hay--nWC}`C7>K7O||q%ncUZ-etj!36COk*_*=QaqsK?KZ3(>g2ubGm zc##e$-~^Vs!tFmg33O3+N?Fm&R^H51-rQQ=%v>I-j-teON4-s{vMQHczT7uLIhsK^ zS8K-dg}XkT8l?sVi-RTjr0f1<3wj}Q6Rs^FBF6t@l^smN+0+eJ z%ENiO;^ML}`{L30g>^fJyyYn4m{sL=?LwA}6CphyR619Xc-}^bTEQ7f>Zk22o53QR zQ8BXZY>jwy^4E-jQd7N{5Tv5OrBGhgMBz{>W2$beGu?y+m%(y&SV;2`g~;S8^x&Av zi7Qs&RVfgt2r}7pa<#969K_{x)j;89v7Jlqw%R>cG(B82JM8j2cxktQ z!l5c~ILi3GN`ab*Q9sGg86C*nC5us5^pE%Y5}W0LR#HK8Q^4I(sUB;T0_`xnKGhX} zbrzML1j+9f)V6I+i|0>@3*I}0zdUlrsmkMG-TEu-1}|;q2ohGd;ip$im$u61v}LO( zrVH>TM!XVRv2tqXIu`!BDLqYJN&T9RVRENPP^U-?Kk%OgI+WVsejYh2h2pVl)oi}P zz%D}rTp_kIk~9Z7NwiYFOd6tsG!~`^E@sT}?1}|PLpIZqP_`+aYUN8vz}Eotp+0FU zgO)1=P(x3m$3>@UpbjQrU??hRk2#MQ)Q{;H#s@}=d73NyQ+b2HnBqbtVqvIM&9;x* z&EU@5!g1J>WV+S6wBb+D$IFybG-CTU{%&kbr5*I*NCH`SAMvV$rk34E&@0V?Zz}OM zs&bHPc6qSWdL;bR#c1>Mq3QIzjIj9(+ZEXCtm2W z$;=-_m{c)1H@bYfO{hIs$sK=q4%?q{Z3RG1mnVw=-=L(HeHbGTHzTt>m=oKBE34sm zsc&I@ybF`p)v5dMk!seNFcb~8s|*MyD&TB~$dw3sH@|v)kcTt+dpykq-%>5bc8&UO z4W`V33;XF$75NSHYER?)33&7qkNq<8bsdB42PCi=7c5@3HMQLW`BJfEixdN&OdrNi z>j$W@BG)%;h{CQU>I1_IH>NBoN*ETM^ z5C}Lhxzg^eG@0@Cb7tT;R$9X6mPR;eI}Ve}!n_l^#q>ztY^Ok>X{&_h*k!f?$9z!T z;f;P=WFokY3g*?FMzLnCg-8?xd4z?@>efBddEu|1mJhI`@}eubIDgN`D0EmA;j&2+ z(dcM+7MEqqgfZfjC)_W;%;u$Kn`(bg=P-PwDux=V!l6qh&UW)Fv)s7$$mns$a-b)A z=}cL6@YRy-Zeu0t5tr1|~yY3E<3ZOo*{uhc2`AZ+)%~d*(!KX z*I5Dg32Y609+bUUeS2raV66b!t&amsEnVhJx*d$^+4&69SdZHPRUJbE(j^G*R%PK) z+wsg!zeZ2wk$UzWR;vyo*g`{%%KiSX)f)Nhq{?kuCn0MVp~s8 z_%!R|J^fM3LDpy35SCqgh;4R}6_f$Jo_ z5r!2R&+xhx+){v6Ozk0=!dT@)R~?}r_RNq}s2I9NMi#js$y=BhWdi<VT z-cVKzHhC{2V*H7eNy``*cV8t#v5zeDPh0x+X9^e_+emh2>iVs8*}rIBDi@J@GZ8N1 zDesK+9Tf@6snbAfCafniTV7N#!dC?(-`4=w&u4~7m;-u(qxnTzu$VDYh?|D?FaB9>124T`pLypxKU` zgvU6ZgXOtUlVRku)v34C`y=QZ739-Pw5$7hJzWxD7F*Pbf@;z!`-&D1$|g#2!QRE^ z9gi`Kb>?oZ_-Nag_ZBez87LiOIwQHve2U*uUk@icsnx$tA}loS8ynk4saJBgBcSC7 zGPYJkN4O+3wN)Cxp;uf#zA~yIDt&Q-oU9!VT8?X7;nJ{UsEDDQ$51q{cG=y)!xHR! zn1Z2JbW@a^Xt07$%SUMb4B88ZXK=hLXkG#O#PIMuw9IS62Rs(X?8H;|o)pz7Nb^=K1Nk&v8 znORu-kz(Hf)+@ruel|`8c;p`I+;OcT;mUjsc(Vj;`v1w_bW%8BL-G1fsD#>ky&Swd zm8lmNfe;jrm2l)g?8T{)PA_40XP3HG8NBC-Az61qF=G6{;|XWHo=LW!;vK(0bX@jw zqQG6%^@wHdG^3PUM45XWNN#D5!u5<}JBh+6ZKT;7pr$#MCloQ}hE z(57lXO+`w7eYjxdeQaU~NRI|FrihP>aw_3^+;ewK^_M|QM8{IDU6S#5%hdhf`Ih3v z@_&3w?76LEI5FVqySUy(c)iQmMkfBW64`=XW}S!dZV+jFF(z1jLJi) z0BQ5U(s7xa*ffrGa&LtEQ(pv}XyFPs529PA z%E?=$#)lbketzM~dNyciU%i%On8wvo2-w4M-P@PMIIo-WSDd3qS(EpAbpGfJI?d+m zlN#SV?L{x&2kCDM`=p)pK`m_=&68ecrK3?Ey~;8CrfJQ=#a?AZTH)m+X6H>yZrw}0 zr#i}qOi)<<>MJBKNn@4fdVI>=CY87>xMrA0e8%%Ec@o%e+gAv=iQ2z8T?(=fZS+Jz z1HH((ktEB`$CD_+q6yvw*q8pV^aAD|T(cDtzlgxNekGlCN;6UfN475F<|urruvkVD zWq!^qJ_Gm4cX@if?vV4}V9BdgDSU<$P$SCDqm(==6z_1sEoh)BhZ2d84ikrOj$h%8 zX1d1mHrWI<@FX8ZGPC?~X5+#6Q6Bk9zUeqXkXP$-oaw>2n9c6dNBVqW<`%nd~#p z8EIIn|I29)LtqZDyTPt0&Xy`Xnq}*5y3+$OkMxYRZTrjT5MD+Jq>1bIq4#9j86{@T z7gNCP4>0Dv87zlcK}_a9xc;8E=smQW59g`7KGh_pxxdv5dC1@dcJ)MM9=kRLob;6(>f~LH$hNvZQAYtz z%>jn6k1p+XyFW{KSZ`lUs~Ng)C~bMTVrqBscPE5H$!w0`cbWW1Kbf(tX9(9B-c)RS z?~r9+TeGpXCp-LR&3+)rT1l^mK01y`v(n#GTC07?^*ZD}-XWwc8nDuC`M@;Cr1$&A z-0x0)#LNnj^(%`&oidil7+@(I=!w{DyrwR3uDT7jpHP$quxzj9ab|Kf4K9s==j(_I z+w-(yhAwx#{{Z(j22UsWvxyvHxXhGn?V$Xetjq0{VQs*tzERZkwUAwx&n>iCk48X; zFE^d%WofF*^Un=tsa~VakZU}G=9{)L7!HixCD^A2{am`=KT{_`UEszPn_3*jkwLYP*mhRIeChlu?xpcKW4~9yJqKk(I*hn(9QK{Sa@7r=HeM#E2dy5@b z{F6{JIOUw#j<+^W$E!&sIx-kk!A7`|MpIR4&@#@RayVD!TcI)M0cLv!0_9}CNNq?t zT}b7NzR&$1m@=W{^~H4ZM7t zg-rG-7=icMZ#+*T%4Xu2?M-()V->2M*IS>;%KM%qOI=xGY9KFQjvBw_Bl^SlMej)C z1{AO36&YUhl#`=*KU^5bjZO{#Di~&Y^HZ%ooNhet>OK5x3mo3{jJ)ODIcF3wP1K*Y z3>kGSgqB6Ly2B2D9T%I^JbS(U>V6~DMbB;~R_tzSR_25LNxK*m6#aTziF5$ik73=Z z(Ft)iC&K8qt;uN@7GRStDNp_Pff*Ql+UVU-MGMeH>hDSb2_qIF+Db5x5f&e-<0 zSDxz`F?BU`y(^hEWJ9sV(r*@ga*^ula5?+pjTBEa<(A+pZt{d<7dDR#qcr z(%NXkj<9iKqhBEE`J`Qa_r>Nnia=ObEDSu;OXzFEDXNihl~FyY4^FV1ZV-YUiOO+sYbZd1LfHRw*pSyA zGbd*dx38Qd4u}0gW5eU->vV0UjA7&88;L`4h?JNiFRWmT#aa3MK)FBfQ*iwPA%Lj-n z=ooin!k&8HnDnSR{|@hxv;4YkGfYa*dFPrmB%rTzef&vj!{e5wZP)HhL10?#z)t}W zeGf@R9ogTf4twE=-`prcKuDO0EDlw0m_P`oqvftWiRGmP8G}u1@C8Rd#e=E<_z%B$ zo6dbH*=tS7C@QDMI6aFeC~BH zEe0QnyL@#=U#!>QnQ}#1XjfXpcYhoxbyc|%;r*uBHf-arPLViR)~~&hfY2Ppk9$_J zZD3oee$9?jZ02z7+_L}L6&GkHsWVZ8;mHwOlC|0L%9f~ll~JUMCT{=|zY>(UAD0Xh zoyIz}!xdSHZX~aFn-i|vHxxSq<1pOp4n*I6;GCM7aRwLWe!MR0-6ayfG+H_tcx&oP z5UJGMrU+cpqQAiEhn_2kRlstSsf9DaN9ff(4R*LSrBA zmY~W!AMY=^{&t1Hg=duz*dq};Jw_~dci;uGkk}_kgA>h{qY}0>Edl)r9qPwB#&kIx z4;~F$`|~tg3-X3XC@}9^5)nK;Rd?~wgp>KkcU4n#EpJfs1(t6^x0OZ2ae_0gZcex| zQ%w_guFgFJrAt(W{37fN#RVzD-Xny zkN1~YB)U8wx2!SctwHb%W-D@C$n6=9O3|Hq$!QXtKZO4fK!R3R4cx)}&yIX8F<+j5 zw-mwPq!UbanVOlmoso&L>(&VpylD2Q*G=Rde@udyji-p5|DCPeIKEeN( z&9`)x24~*issFonf~kRWo454z-_2Fv)V_J3FA9cwy3G`!@SulnzuIAey{IA#CWA%$ zm)REY3^*j#1pSeexs|>^oWD8v;bz>vVPNu&6qkBVeXqD-cx0j>343ZdrK|9CrNDj+ z5?G)l+~J1*m~zUF`hWvzIxGdn*AsIBqbB!W*b1X%eO9;R&ax#I8{tR^&|(VqjD%a) zwE8tFW0)HGg`!{$%*sk?LHMWy>lZ={CSv@k`S7tm<{*tm*eDl^C*lA4L8^}39Q$GF zh7N`>-ebyHBdnQ@FmL3Ul*$~cWorJJ@K~0()>cjlHN+n&-^zQX3n>K0U>h2>o?vVr zmo3L{N`N`)4~$>eS(57xIH|^5ImoH)1N>c+fa6j#B0A#YANz4fsrm&A8cYOlJYem> zW3Ay>6{I*$(c)4ny(pF3QL_FtFjwmWa6e$(YFk^m{yE_L*Rs%C__=90is|XblT)i(*p-xJh9{8v503yKQ5bZjAhr=t+(>kIqhG)rftOs7L&&O zuyQQ4Vt!WN9B2F|+Od=VXnHkodL?hRRH0BY7zBR}-!ob$e-PRfdn|+bW`FWO?X)EB zEnL*gq;0&XP{sU8tOgyx;L)!qh>k@v-(9dmC%z62(X)c2)3h(Iq#~8zCbUGkNCCCN zQ8+Zzp~z))hA0lp466!<21HW;AU&z@U-?26!XV{!o=VxPxwYf8-Ejy@)%rP9(DGj`62uK8a*d5- zEoSK1VewK6(!-~?)}LFOnW3W2TaS3Y*^VY6vtnj~0>5elL26-s8qi~qx`E9t+oKJ| zSaRC0>J%@zq#d-HzYdmK$KYBG!Ryd9fut)NY$0-*37Ty&JDNPw-K zg2oy@tw~wZ*O^b$=Z3474q36Y^xV6}ziq?0X2ZGXz`5>~ul^skon=^5UG(Td6kb|D zltx;@p}R!7MFc^*hVG6TKw{_+X=GGF1f)e;dgxB+?#3C(xd-)q@AJQ({$DO1hG)*R z&)RFRwf5e>z2=;~Wor?6+Wf|lPKE=s3&N ze%i4#+VW&SxHdGa9n-Vn?x0h9z(*UBRVI^7=xY`tF|&J4vyG<(seSxBbE{%*qe8IT ztZ2~8`nBw{U_Cjxdu7Wnt?L>xY1ZdfOEfm1aV=v(EvG^9GM~CdW+FaYZ&da1Sca>! z!Z&tkS;x{qU+<6k(AaUMQdQdjJjd?M>kb81?zl&sm7XS0RAhdjFMM?Qt{$@>ELY>aq7j5>G)uXt z-{%hsW(Xl+2uYNw+^KZr84>CxFqxlB+NEF?=h^Jztn~^b6j^c=UG}W^TaW-L27nYL ziT3cc14+ZphUQ6{;cwr!+$GU!t`h(~TXX$wm<;(8VjDPgZT;b_6GUDk$a=SzK zaEWI8MZfuMWt{a?61vgk)T6o{&hU2OQCfyE%nqsx|^Sr>`;bWap%!-XGJ_*U4;@&>&9tn_Dwlp2(C6T2lwylPD zh!4dGP0|Yl%lOtdT7}SCFb=*IxxF8DEN*1~)W`{xC}~2AZA721s_m@}b$^ir)kaP3 zJ0lP0xC|;a;ZO2ymydjS2(U^KEuQ4@@_^?{?(VT>iMWf-Z4G|1z6F|HwYr5%#9W81 z?DX=aZv1MxebdQYdZxk2Yl9cDw{4H-E!+gJ-K!H(ca*|>eq`>*%nY%Twm@~%JC0!Qs6$i4|dKBpKDUgM zHdK=#*(t&r)5qA2_xxKR;f^p}{x~L&5~XM=rMAMG%FR7=VERGC}v1YYi1BkE$aY~tMC z;kFIFe@&exWJa+CCBAK7Q#{*wj`A8=#84nL9)0Z+;e2QGFmMSwZg-|RWsVKECP*~O z*W~Qp+hQi305Mr$GmY8Wx8J<3_|8QwD_rJrCsG>=rWS zpxAHh3Fbv+0~mI2+i*O zmMN9hdF3#FMe>-I2p8)(UC5cFQXJa0edRcpCm8b9RlDoePa@|M$5wTC7a?3<$;^?Z zh{yv2n~w9zcr|Kjct~YPg{jmOv(gE7^t|44OvKbu&FZ>e+Z1)t&{&`0@`ECOkdwK; zKs+<}4T1-SJY%N2j35?%F|5H+I|{rW!Wa_wa^g9eBC6JUlcof|ys_AmS6qT?%9=MU zjexCqT@_S<1HwaltT1w`s* zn=bH5v++!Q)z1fOV76EBmDl~`V^!3@&aHSKPER<;1Ht5b3b`8CTOC`sDway<>|>c+ zSwMqPdz$zs?83-0+d2y!5 zD=>3g?L7XS61ww?1DB|ptUYHx`OH+!isc|X>qw`%wTm|HP89L8(W$2f7I$za9o{qA za^+xm@=IZ7uigs?rqa+I8=ja~Q8l`QK+@%P-w9~zhNp$v!r!^qUHFjW2#@pG>?&PK zc78BJy+Xpbn>!dR>zP?DaD{bTDyq|w)vQ#SbnDGaRQ<-05fNF=BP$gWMKj9kTXc4; zeHObBj~fEly~GgS6R4#hDnvhVRBh{-;2*ANu;V;Lnm*EG?iNr?$2YvLRihIRje#ob zfhWawH9YxnpDcP1+1qt`4N85ZtvX`9;K9VfGSQW~Bd<;QCQ0VaU^@?iO9+j!00!}A z%Bz3Ivp-IYQtOJ@7utH_c%!FP6}+%@=Wp$w7v0f1V3A8-z`AWg>v0R=?e4MNA8?*6 zQP`vL%*ZusMUm6yt5Hl9rses$yaQ~{dl9}JU)~B=dxPnSaoe`gdFzPZtziCJCepxp zDUMt1cP>;E2Yx;V@n0)Bmoljtag=CI zJhzRhAJ$Z{X6MupO}KxSwt6JY>-@TZfH zv+XzMG{Z3Q-B5mOafzU(m#NeRSKIpS@vwc-BjIMemlkqY7_8(6EA?!*#{9Oj2R&SA zg&Aw^a84W}osqmQn>^TSgl4U+>A>Of9mn3Nk-`KPMn<>DDNmM#xgNIDNMUM`ieZ(Bb=sL)el{z`a=w% zM5lz#6^q*yQG(bfltTKmHI9tXk}*dQ#{sl*IzxNN`)H4znq6Y^M^)qFKmm z=)iuZ{3+1Oe9WHe3EC2tl0Q*d&N-_vcOl$P#!POHXFFeI?47!2&$um7 z6VBsXHw=hz5Ib1)77F{EG(vbRxoVZ`TA#_utsdiWF{KZmYqaEU@*eOMx!m4j@6KH(=dtf;9@WQpv6-z;CsUAecgpAmQO^k-*$}n1^^u0IEx8&vEPS>SE^ShHt?^%tfB`d5HR`EcTqJM-0#Ps=&+JQj@y?}nb4tKmts5B=qcPSOz`mD zKF2|=Bk*vmLYlJtXnMI1Hq<$7U;=wvV>h2~HQU=TzQm6<$3^JOJ%wlZAk37Lki7nv z%Ub?^J~ZUn-REqBRxQOZNE<=Hohor(j0Z|y;kek$BPV;&nq z_(`L0j!53GjgeFr>nSE9XGlm$wjfaRM&?|#!q28-Hp+n8jjkS?)1nmWY;}u?tI=-6t6qr=@30q{$2?BV|VX?Hq9$Foj7?pIrBWy zCBfu;?uO#08CZeCxwDUNZen@R;h&iF995;a8veC285mP;rJU+FAJ-n*gn-L|iTGaG z>T3`S-`oV4SE`^*_6CYouYH>9LYq9Xei`(e1HJbPtbfemydpz?DLQ$Z?_EG>S&8E}{3ynBgZSi=MT zb$fop2_LL`{thY0IC=fC z6+n^IWgF}rDz{kzI9UlsR1UZd103E!#REjh9j?f6p?Gzk!q~oIMi^T|2 z-(^2*hh(&nk^pOfHzLVCOueBYw9$r&)RNJ^%j{xu783V9c}W)a`>SEKp3sMa3p^dx zd%y3P`brI|m+)$b$m8h&t>8U6?a*GGKfG(wSQ!)y#m7o@xls1Hyk^h7D7$qLMIVei zd$Iyk_B-N*HjX#t6Ni&(CcLKmV5c`F8)xy{QS4kD(Dh6YD}@an=B;LtfIhWM3tpp_ zYq53$x7Arsk!@!_up_DobB3Z%V#+WkTgqoXOP9kudsB|*n-t9BFf_0fg~(Tm4szrL zC6j6n7OqJLPZk!__g=m<AjPIyu#b_BG%usz(SJfg9i7pmQ!NOk&oQ27i}g?hlBBz=Pynv z2ihwPTbJ;&&aza5nl2mSZktw4vN{BfTXaR;D;ppy$#);LK=Ik^aI+7)0A5_cDOM#p z*wsx#hTCam6JYARXiVswqK77SpM4I{lYWDPUV+XEr;G@#3E_oX4P9Qx|C(GA(!Sn} z=Hj4|)u>Q)?*L6SAo&jVoVPQ6Zs*BuQorb0uD`D(0)EJ@AU>YA<9o6uU6!-%!Ccjq zY)LM>(PH ze09}1SE0t^d*2tPTa)?DhNF6oN5Rj3Ii!~j>C#X5wvAVRI_sduv7Ouny5^-Vmacc7 ziqd=T30&{JheFtq+50~;Vl45TGJ5PauhIfVCW3`|BYEK${&ZXg>t8mYUF+I(;d3s; zCgQMK|?bnF#wF6KQ~!w#=DIxLPBOV-)NCw+`LRXD%q9|S)*KJ? zb!2x13HBT%tYwT*ZMTWB88#ZLWVQmTpL#Xb*qQh&W3Y1TcTrSk$ik@Vt%FjG7Mp{Ki-AM>*JJ+&aAN zw_QYBhU{3VwN_UUj!l-U82h=#i3BQ(af44?^LI49jU1A@DE6%{g6_m&!I zifnT~mqc0APiVOnBy;Xv&d&Jh@e4+Kf(0t_=eyp%U2)L!S6TuR5(B;NI*qUR-<>V| zVmYbPymazsF)+RsHlk+$X&Ms~I6MR2Z&d_S%~D zq9t06a~NpqW5erMZ;>Q(ZnUcJJxKe&L$JwpCK`w;a=d-v(C(nYg~nZ&6AM2|I;IqN zl0wbg5>@Pt({m=lv^nA`9Uz^@bf8YPYuO1k}K9iCVh`Kq!+tURFqQg9HO1c!aXeW zT|456u*ZBfUzGhdx_(Fm)i+7N2?%3>=z%oj-6b&ofnJ<54T{fMT&;HAXp8+4^L+*L zzD5@lzyG5<-jdDgAwBvh!!5?(I2sPAfatwWhyAM`r1?bjPrzsy0@|1Dk4>7A*x9i~ z2pyo_SS?$q!{nJyydFFF|3g87l08voFaG6DdykJbOSFP^i(1r=$|$(oLEC)`B8HLhta8e zS`+?e1CAU^X9!29Mt2f8#DkZz>EV~3Y@*d0vdAf;%IA*$&|Xcr)AGQ~!TPX)cKNN? zEQwPFRbZQ*Y|A!kPD)fq>G8We(Bkmq%TsZBGq$*ulnZB8@yC>-B{=~oH|ST7QS#|W zM$5R%i{{8*w)evViVq8kIp3&1Q4Ixj=Z;BC$~T&seCo^Uj$Sco^I3QH@q&F}`ZzPw ze?>_xmH8d@N=Wtjjvx=cVzW`DLdZi#x8(Z#dd0rb7uaf9eLT*BI-j13QTauH$l^R3 za%=5`e$RJx%?9)yCl;4iA!G%CDDsKyv5yLpj!}4eDfnRwKY!2U1cP5MCTKZQuE^pa zkID>Xn#afDlSq2J-us?)w#D1iZf{PG0e$FGn z1I&wfdZb0>nyWg=Dfs+V+#h}uO}kSPo6i7v?1zxzZ-!WY<|sz9S05Q21@X_}4cg2=RJKW*=GvBK! zzo4I3O@J}~ZV52m??&ZRBaY0Uz5h?bFu&e=seg;7Q|9v(65Hp4%Yga-`BEKPy@G0l zXG%k5e{f+}r6JL(HFW=G9dy$o`{oM2ownzHna13!4^PWcj09!7V*N(}?QT(so^gYX zKj7!Y?rlQyE4F4#E z3?kQIJ*~%1YJF8A^VcS`s`M#6p?~y&h3H0L|LXw=Vr^Du&U$LQ?GM`2$f3;gOnK(D z=mC@hc(R?YtYKqcRWJ8HV_bZ>tFEL%G8EEzezc zya9c%u!e%Qy==ZqL11`F+a&4Agg*X-XZLP?!D6Wm-9k$!y;lGI@mfWroxOnf)yYD_ zRj05|p@>Tdod6LiQ$h%TFSHVqbG4(rS*HI6n2rWbDd{eu3-T~dj5ak^QQl7V*RjyP zfM1^^&c-xrtOHsR0%{C)C}+!^Vb%_q)38;mz@(+&uOB~Bhx)SmUW>LV4?!n^Ma~9h zFX8YoU3+8b>QWtT6^?l{he9U-I9{x^N2gycTO1dCN5d)KiUfVe-9DT=c(UD@Bq9b5 zIw^)(nTSL5!0R6SzPp%sI6mbbA^@ell}dBlw7iJcJPhbyt^jRM8@^u4)Pp<%jx>|e z7^XQUY8otkna8_4iu3~Yzsa-TGsIOUH2Oc3=Yfj2@xE5{>;x9vnLwj7Op9VL_J z#(@`$sDSf&L12^A$YGbXWnp1ML3P&)waoi%d2oNBCSYulP`wZ&E!npk`j=y>@_!HK zx7?pGL?6_o7e{At;L+oiIU>4GPQ|ZCCU~Nv&MOay#cjW+TWX)}^<@mh3F*g>kLD;( z;U~7?SL^K1(*PC*I5FGT2plvLGn@wcF7+D1sT0gxp%BCLbwhgt8pWcmTeiDJ|9peC zLmjn%xbmi3x)?lQt)TAtVC#>IvwzOT-w6WNpCzSK*O7f`HWdfL^)~K=mn+}9n22Lc z(M9O~l?zQ04cfL?lR6mez-bLOc#u0s)w2BkoJ#(S^T{sp#B-}y%a%EBe)0arW*wKs zP{OI@a{Zy4+D4w;jv!4BNE{oj7=eD{ffeZL;$;y%c1&G0@o1T!Dx zT595m#5!5Q{Encr$VFOyxF}Y9#bwyHDedVekm>uzfwqKS zC&ovI$c$L~T+~V~fPPJBsot2#&W@NaLnhpSUDo89C^eOF=iCKZcEdMrxIp5i=qPVB zItmLDBQ=GVTGVBd6dW4>nHm=nYWV2eu&?z2+pN|08QCb_>jqiRP7>YcOcR~6b8I1 zHNci_=I*G62G&_!2;k=@MX)Nn>A)D&k{KF;7XQAHbxWY1uGavD%3@y=T{6Cp&jWf^ z=SGu7_wzC87TXVGBg?KAy=5n}^bGMm9t#H?acI-`3&Avs@V5B}*D3H)+x@j#wF-<@ zGsce*)T}g3e);lV`a*l*(ccy6C;AfNACOA5K=hobanOhS&<-Yv(@m@zO^LP?F{AT` zK%T&=nXfyIH?`c+{_Fs;kW+}r4Hi5f{Iw&#&bRcn(P3|M?*O|%LMyh^hNi7iT*MMJ zthzmm$fp%Dd8gl;0OhBgZbn7X!<|Wy`VaW>1@8J;RccWYteq_Jr z7nGQy=oF=l&~ZBig4cYyZ>N0vM9`JREI#4qV(NzbD*8*l3?(ojGQQ~@Z>D&%lr>!C zV1htasBmx&Lf?`*o5qW$Pv7~xp&!@s!F*4A_xSN*Q|WA9D8sZRc*E6bNxhGPbZ~~) zrObz#*1~yx{tlDv?5oz{(NQf8tjv_s4_22OzMCcbF;r>F;DKi)nOX&reY*6VD_d2dDQpcZMeUg4&LrRk9Zb)wZ z)P9NvOyp#`aS->eKFaU?+dco+0ah9eSHdZ$P>{o;^)oipBWvfCd1pwy^A9}~=3mEhYf`|+jd$x=0)bPqV_{wlD=QCyV$AjC0tn)&Bu+pG1R)$&zV zLX8-eiQ?ghH@JUpiQUT{m_!e`Qjc91?CP}2M1VEof0lv6tBxvx0yAoa!R?%WlEpL# z%U^=kf1&5}vwF5WcRv@NuOPrh0JxAAIns&Si8CbMPz|OkGf2j;S}_^d+727=^1U*- zWo=R&);>?JaFG;jh2K}qb!K~;LNhvmdHoJoqKL!E)Ra~|=>9Y=6~#?Tf;3X+(^ADK zS*>6FZ;}CIYIMwZ@hzDm7+*qwIrpa0`psB4p}Vt_td^+8s(&nQN?{wfTxkk^X`_wW7qO-q1P)5fU)q6IQT^1o99>vl{d%6F0f2eFwI{zK}Uun+-<6$rg62+E`U*NdmsqIVd$jsL5Ft8Q4bTQH60*v9ma zJlz|jc69&q1qA!T^ELeZPgLb<0=czP)+{=tc`X%?Z@h^LNmKb`+^dq7+_Dt=yT5Ig zMvfYRznB@&9}R&IPXgkI(;Ap+C3%uZsS!3jP0-XJ~dUtwlQwcK&Qoi2?j6%WKG$ JJT-m&e*muoxjX;> literal 0 HcmV?d00001 From 58466a3482f253082bfe867c01df7ae7fd709b8c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 15 Jun 2022 23:04:00 +0700 Subject: [PATCH 139/212] Github Action CI fixes. --- .github/workflows/ci.yaml | 20 ++++++++++++++++---- Makefile | 4 ++-- tests/src/Store/SecretStoreMysqlTest.php | 7 ++++--- tests/src/Store/SecretStorePostgresTest.php | 2 +- tests/src/StoreMysqlTest.php | 8 +++++--- tests/src/StorePostgresTest.php | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c630cee3..becf4ac33 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,10 +12,10 @@ jobs: steps: - name: Setup MySQL latest - run: docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test_db -p 3306:3306 -d mysql --default-authentication-plugin=mysql_native_password + run: docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test -p 3306:3306 -d mysql --default-authentication-plugin=mysql_native_password - name: Setup PostgreSQL latest - run: docker run --rm --name=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=test_db -p 5432:5432 -d postgres + run: docker run --rm --name=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=test -p 5432:5432 -d postgres - uses: actions/checkout@v2 @@ -23,7 +23,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - ini-values: memory_limit=512M, xdebug.mode=off + ini-values: memory_limit=512M, xdebug.mode=off, phar.readonly=off coverage: pcov - name: Get composer cache directory @@ -43,6 +43,18 @@ jobs: - name: Composer install run: composer update --no-interaction --prefer-dist --no-progress + - name: Setup Database + run: | + n=0 + until [ "$n" -ge 5 ] + do + mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE test_db;' && break || : + n=$((n+1)) + sleep 2 + done + mysql -h 127.0.0.1 -u root -proot -D test_db -e 'SELECT 1;' + psql -c 'CREATE DATABASE test_db;' postgresql://postgres:postgres@127.0.0.1 + - name: Run tests run: | export POSTGRESQL_USER='postgres'; @@ -52,7 +64,7 @@ jobs: if [[ ${{ matrix.php-version }} == '7.4' ]]; then export CODECOVERAGE=1 && vendor/bin/phpunit --verbose --coverage-clover=coverage.xml else - vendor/bin/phpunit + vendor/bin/phpunit --verbose fi - name: Submit code coverage diff --git a/Makefile b/Makefile index d10b9f42f..84eb1c67d 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ update: php-info ## Update dependencies @$(PHP) $(COMPOSER) update test: php-info install ## Run PHPUnit tests - $(PHP) vendor/bin/phpunit --configuration=phpunit.xml.dist + $(PHP) vendor/bin/phpunit --configuration=phpunit.xml.dist --verbose test-coverage: php-info install ## Run PHPUnit tests with coverage report - $(PHP) vendor/bin/phpunit --configuration=phpunit.xml.dist --coverage-text --coverage-html=tests/runtime/coverage + $(PHP) vendor/bin/phpunit --configuration=phpunit.xml.dist --verbose --coverage-text --coverage-html=tests/runtime/coverage mutation-test: php-info install ## Run Infection mutation tests $(PHP) vendor/bin/infection --threads=4 --show-mutations -vvv diff --git a/tests/src/Store/SecretStoreMysqlTest.php b/tests/src/Store/SecretStoreMysqlTest.php index 970549bc7..6446e03eb 100644 --- a/tests/src/Store/SecretStoreMysqlTest.php +++ b/tests/src/Store/SecretStoreMysqlTest.php @@ -10,7 +10,6 @@ use PHPCensor\DatabaseManager; use PHPCensor\Model\Secret; use PHPCensor\Store; -use PHPCensor\Store\ProjectGroupStore; use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -50,7 +49,7 @@ protected function setUp(): void try { $this->connection = new \PDO( - 'mysql:host=localhost;dbname=' . env('MYSQL_DBNAME'), + 'mysql:host=127.0.0.1;dbname=' . env('MYSQL_DBNAME'), env('MYSQL_USER'), env('MYSQL_PASSWORD') ); @@ -63,6 +62,7 @@ protected function setUp(): void $this->connection->exec('DROP TABLE IF EXISTS `environments`'); $this->connection->exec('DROP TABLE IF EXISTS `projects`'); $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); $this->connection->exec('DROP TABLE IF EXISTS `users`'); $phinxSettings = [ @@ -138,6 +138,7 @@ protected function tearDown(): void $this->connection->exec('DROP TABLE IF EXISTS `environments`'); $this->connection->exec('DROP TABLE IF EXISTS `projects`'); $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); $this->connection->exec('DROP TABLE IF EXISTS `users`'); $this->connection = null; @@ -147,7 +148,7 @@ protected function tearDown(): void protected function getConnection(): ?\PDO { if (null === $this->connection) { - $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); } return $this->connection; diff --git a/tests/src/Store/SecretStorePostgresTest.php b/tests/src/Store/SecretStorePostgresTest.php index e0852ab37..d2e142008 100644 --- a/tests/src/Store/SecretStorePostgresTest.php +++ b/tests/src/Store/SecretStorePostgresTest.php @@ -49,7 +49,7 @@ protected function setUp(): void try { $this->connection = new \PDO( - 'pgsql:host=localhost;dbname=' . env('POSTGRESQL_DBNAME'), + 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), env('POSTGRESQL_USER'), env('POSTGRESQL_PASSWORD') ); diff --git a/tests/src/StoreMysqlTest.php b/tests/src/StoreMysqlTest.php index 7b11c4efa..4cb049436 100644 --- a/tests/src/StoreMysqlTest.php +++ b/tests/src/StoreMysqlTest.php @@ -51,7 +51,7 @@ protected function setUp(): void try { $this->connection = new \PDO( - 'mysql:host=localhost;dbname=' . env('MYSQL_DBNAME'), + 'mysql:host=127.0.0.1;dbname=' . env('MYSQL_DBNAME'), env('MYSQL_USER'), env('MYSQL_PASSWORD') ); @@ -64,6 +64,7 @@ protected function setUp(): void $this->connection->exec('DROP TABLE IF EXISTS `environments`'); $this->connection->exec('DROP TABLE IF EXISTS `projects`'); $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); $this->connection->exec('DROP TABLE IF EXISTS `users`'); $phinxSettings = [ @@ -90,7 +91,7 @@ protected function setUp(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - //var_dump($e); + var_dump($e); } $this->connection->exec(" @@ -112,7 +113,7 @@ protected function setUp(): void ('group 7', '2018-03-01 01:01:00', 4) "); } catch (\Throwable $e) { - //var_dump($e); + var_dump($e); $this->connection = null; } @@ -139,6 +140,7 @@ protected function tearDown(): void $this->connection->exec('DROP TABLE IF EXISTS `environments`'); $this->connection->exec('DROP TABLE IF EXISTS `projects`'); $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); $this->connection->exec('DROP TABLE IF EXISTS `users`'); $this->connection = null; diff --git a/tests/src/StorePostgresTest.php b/tests/src/StorePostgresTest.php index 74166db0a..ddc5022b6 100644 --- a/tests/src/StorePostgresTest.php +++ b/tests/src/StorePostgresTest.php @@ -51,7 +51,7 @@ protected function setUp(): void try { $this->connection = new \PDO( - 'pgsql:host=localhost;dbname=' . env('POSTGRESQL_DBNAME'), + 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), env('POSTGRESQL_USER'), env('POSTGRESQL_PASSWORD') ); From dd64f3270b57fca735b0912f79c0d9684d7d2d86 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 16 Jun 2022 00:54:23 +0700 Subject: [PATCH 140/212] Small fix for tests. --- tests/src/StoreMysqlTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/StoreMysqlTest.php b/tests/src/StoreMysqlTest.php index 4cb049436..c0eaa97ef 100644 --- a/tests/src/StoreMysqlTest.php +++ b/tests/src/StoreMysqlTest.php @@ -91,7 +91,7 @@ protected function setUp(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - var_dump($e); + //var_dump($e); } $this->connection->exec(" @@ -113,7 +113,7 @@ protected function setUp(): void ('group 7', '2018-03-01 01:01:00', 4) "); } catch (\Throwable $e) { - var_dump($e); + //var_dump($e); $this->connection = null; } From 6930f7d8701030abd0a1d2a7ac8a8c961997f784 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 17 Jun 2022 10:46:49 +0700 Subject: [PATCH 141/212] Improved DB tests. --- tests/src/BaseMysqlTestCase.php | 178 +++++++++++++++++ tests/src/BasePostgresTestCase.php | 178 +++++++++++++++++ tests/src/Store/SecretStoreMysqlTest.php | 208 +++++++------------- tests/src/Store/SecretStorePostgresTest.php | 208 +++++++------------- tests/src/StoreMysqlTest.php | 200 +++++++------------ tests/src/StorePostgresTest.php | 200 +++++++------------ 6 files changed, 640 insertions(+), 532 deletions(-) create mode 100644 tests/src/BaseMysqlTestCase.php create mode 100644 tests/src/BasePostgresTestCase.php diff --git a/tests/src/BaseMysqlTestCase.php b/tests/src/BaseMysqlTestCase.php new file mode 100644 index 000000000..4e44e2402 --- /dev/null +++ b/tests/src/BaseMysqlTestCase.php @@ -0,0 +1,178 @@ + [ + 'migrations' => ROOT_DIR . 'src/Migrations', + ], + 'environments' => [ + 'default_migration_table' => 'migrations', + 'default_database' => 'php-censor', + 'php-censor' => [ + 'adapter' => 'mysql', + 'host' => '127.0.0.1', + 'name' => env('MYSQL_DBNAME'), + 'user' => env('MYSQL_USER'), + 'pass' => env('MYSQL_PASSWORD'), + ], + ], + ]; + + return new PhinxConfig($phinxSettings); + } + + protected function migrateDatabaseScheme(): void + { + try { + (new Migrate()) + ->setConfig($this->generatePhinxConfig()) + ->setName('php-censor-migrations:migrate') + ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); + } catch (\Throwable $e) { + //var_dump($e); + } + } + + protected function getTestData(): array + { + return []; + } + + protected function migrateDatabaseData(): void + { + $testData = $this->getTestData(); + foreach ($testData as $table => $data) { + $fieldNames = \array_keys($data[0]); + foreach ($fieldNames as &$fieldName) { + $fieldName = \sprintf('`%s`', $fieldName); + } + unset($fieldName); + $fieldsString = \implode(',', $fieldNames); + + $recordStrings = []; + foreach ($data as $record) { + foreach ($record as &$fieldValue) { + if (\is_string($fieldValue)) { + $fieldValue = \sprintf("'%s'", $fieldValue); + } + } + unset($fieldValue); + $recordStrings[] = '(' . \implode(',', $record) . ')'; + } + $recordsStrings = \implode(',', $recordStrings); + + $query = \sprintf('INSERT INTO `%s` (%s) VALUES %s', $table, $fieldsString, $recordsStrings); + + $this->connection->exec($query); + } + } + + protected function dropTables(): void + { + $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); + $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); + $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); + $this->connection->exec('DROP TABLE IF EXISTS `builds`'); + $this->connection->exec('DROP TABLE IF EXISTS `environments`'); + $this->connection->exec('DROP TABLE IF EXISTS `projects`'); + $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); + $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); + $this->connection->exec('DROP TABLE IF EXISTS `users`'); + } + + protected function generateAppConfiguration(): ConfigurationInterface + { + $configurationArray = [ + 'php-censor' => [ + 'database' => [ + 'servers' => [ + 'read' => [ + ['host' => '127.0.0.1'], + ], + 'write' => [ + ['host' => '127.0.0.1'], + ], + ], + 'type' => 'mysql', + 'name' => env('MYSQL_DBNAME'), + 'username' => env('MYSQL_USER'), + 'password' => env('MYSQL_PASSWORD'), + ], + ], + ]; + + return new ArrayConfiguration($configurationArray); + } + + protected function setUp(): void + { + parent::setUp(); + + try { + $this->connection = new \PDO( + 'mysql:host=127.0.0.1;dbname=' . env('MYSQL_DBNAME'), + env('MYSQL_USER'), + env('MYSQL_PASSWORD') + ); + + $this->dropTables(); + $this->migrateDatabaseScheme(); + $this->migrateDatabaseData(); + } catch (\Throwable $e) { + //var_dump($e); + + $this->connection = null; + } + + $this->getConnection(); + + $this->configuration = $this->generateAppConfiguration(); + $this->databaseManager = new DatabaseManager($this->configuration); + $this->storeRegistry = new StoreRegistry($this->databaseManager); + } + + protected function tearDown(): void + { + parent::tearDown(); + + if (null !== $this->connection) { + $this->dropTables(); + + $this->connection = null; + } + } + + protected function getConnection(): ?\PDO + { + if (null === $this->connection) { + $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); + } + + return $this->connection; + } +} diff --git a/tests/src/BasePostgresTestCase.php b/tests/src/BasePostgresTestCase.php new file mode 100644 index 000000000..e769ffcfc --- /dev/null +++ b/tests/src/BasePostgresTestCase.php @@ -0,0 +1,178 @@ + [ + 'migrations' => ROOT_DIR . 'src/Migrations', + ], + 'environments' => [ + 'default_migration_table' => 'migrations', + 'default_database' => 'php-censor', + 'php-censor' => [ + 'adapter' => 'pgsql', + 'host' => '127.0.0.1', + 'name' => env('POSTGRESQL_DBNAME'), + 'user' => env('POSTGRESQL_USER'), + 'pass' => env('POSTGRESQL_PASSWORD'), + ], + ], + ]; + + return new PhinxConfig($phinxSettings); + } + + protected function migrateDatabaseScheme(): void + { + try { + (new Migrate()) + ->setConfig($this->generatePhinxConfig()) + ->setName('php-censor-migrations:migrate') + ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); + } catch (\Throwable $e) { + //var_dump($e); + } + } + + protected function getTestData(): array + { + return []; + } + + protected function migrateDatabaseData(): void + { + $testData = $this->getTestData(); + foreach ($testData as $table => $data) { + $fieldNames = \array_keys($data[0]); + foreach ($fieldNames as &$fieldName) { + $fieldName = \sprintf('"%s"', $fieldName); + } + unset($fieldName); + $fieldsString = \implode(',', $fieldNames); + + $recordStrings = []; + foreach ($data as $record) { + foreach ($record as &$fieldValue) { + if (\is_string($fieldValue)) { + $fieldValue = \sprintf("'%s'", $fieldValue); + } + } + unset($fieldValue); + $recordStrings[] = '(' . \implode(',', $record) . ')'; + } + $recordsStrings = \implode(',', $recordStrings); + + $query = \sprintf('INSERT INTO "%s" (%s) VALUES %s', $table, $fieldsString, $recordsStrings); + + $this->connection->exec($query); + } + } + + protected function dropTables(): void + { + $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); + $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); + $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); + $this->connection->exec('DROP TABLE IF EXISTS "builds"'); + $this->connection->exec('DROP TABLE IF EXISTS "environments"'); + $this->connection->exec('DROP TABLE IF EXISTS "projects"'); + $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); + $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); + $this->connection->exec('DROP TABLE IF EXISTS "users"'); + } + + protected function generateAppConfiguration(): ConfigurationInterface + { + $configurationArray = [ + 'php-censor' => [ + 'database' => [ + 'servers' => [ + 'read' => [ + ['host' => '127.0.0.1'], + ], + 'write' => [ + ['host' => '127.0.0.1'], + ], + ], + 'type' => 'pgsql', + 'name' => env('POSTGRESQL_DBNAME'), + 'username' => env('POSTGRESQL_USER'), + 'password' => env('POSTGRESQL_PASSWORD'), + ], + ], + ]; + + return new ArrayConfiguration($configurationArray); + } + + protected function setUp(): void + { + parent::setUp(); + + try { + $this->connection = new \PDO( + 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), + env('POSTGRESQL_USER'), + env('POSTGRESQL_PASSWORD') + ); + + $this->dropTables(); + $this->migrateDatabaseScheme(); + $this->migrateDatabaseData(); + } catch (\Throwable $e) { + //var_dump($e); + + $this->connection = null; + } + + $this->getConnection(); + + $this->configuration = $this->generateAppConfiguration(); + $this->databaseManager = new DatabaseManager($this->configuration); + $this->storeRegistry = new StoreRegistry($this->databaseManager); + } + + protected function tearDown(): void + { + parent::tearDown(); + + if (null !== $this->connection) { + $this->dropTables(); + + $this->connection = null; + } + } + + protected function getConnection(): ?\PDO + { + if (null === $this->connection) { + $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + } + + return $this->connection; + } +} diff --git a/tests/src/Store/SecretStoreMysqlTest.php b/tests/src/Store/SecretStoreMysqlTest.php index 6446e03eb..c4841084f 100644 --- a/tests/src/Store/SecretStoreMysqlTest.php +++ b/tests/src/Store/SecretStoreMysqlTest.php @@ -4,154 +4,96 @@ namespace Tests\PHPCensor\Store; -use Phinx\Config\Config as PhinxConfig; -use Phinx\Console\Command\Migrate; -use PHPCensor\ArrayConfiguration; -use PHPCensor\DatabaseManager; use PHPCensor\Model\Secret; use PHPCensor\Store; use PHPCensor\Store\SecretStore; -use PHPCensor\StoreRegistry; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Output\ConsoleOutput; -use Symfony\Component\Console\Output\OutputInterface; +use Tests\PHPCensor\BaseMysqlTestCase; -class SecretStoreMysqlTest extends TestCase +class SecretStoreMysqlTest extends BaseMysqlTestCase { - private ?\PDO $connection = null; - - private StoreRegistry $storeRegistry; private Store $store; protected function setUp(): void { parent::setUp(); - $configurationArray = [ - 'php-censor' => [ - 'database' => [ - 'servers' => [ - 'read' => [ - ['host' => '127.0.0.1'], - ], - 'write' => [ - ['host' => '127.0.0.1'], - ], - ], - 'type' => 'mysql', - 'name' => env('MYSQL_DBNAME'), - 'username' => env('MYSQL_USER'), - 'password' => env('MYSQL_PASSWORD'), + $this->store = new SecretStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, ], ], - ]; - - try { - $this->connection = new \PDO( - 'mysql:host=127.0.0.1;dbname=' . env('MYSQL_DBNAME'), - env('MYSQL_USER'), - env('MYSQL_PASSWORD') - ); - - $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); - $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); - $this->connection->exec('DROP TABLE IF EXISTS `builds`'); - $this->connection->exec('DROP TABLE IF EXISTS `environments`'); - $this->connection->exec('DROP TABLE IF EXISTS `projects`'); - $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); - $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); - $this->connection->exec('DROP TABLE IF EXISTS `users`'); - - $phinxSettings = [ - 'paths' => [ - 'migrations' => ROOT_DIR . 'src/Migrations', + 'secrets' => [ + [ + 'name' => 'secret 1', + 'value' => 'value 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, ], - 'environments' => [ - 'default_migration_table' => 'migrations', - 'default_database' => 'php-censor', - 'php-censor' => [ - 'adapter' => 'mysql', - 'host' => '127.0.0.1', - 'name' => env('MYSQL_DBNAME'), - 'user' => env('MYSQL_USER'), - 'pass' => env('MYSQL_PASSWORD'), - ], + [ + 'name' => 'secret 2', + 'value' => 'value 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, ], - ]; - $phinxConfig = new PhinxConfig($phinxSettings); - - try { - (new Migrate()) - ->setConfig($phinxConfig) - ->setName('php-censor-migrations:migrate') - ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); - } catch (\Throwable $e) { - //var_dump($e); - } - - $this->connection->exec(" - INSERT INTO `users` (`email`, `hash`, `name`, `is_admin`) VALUES - ('user1@test.test', 'abc1', 'user 1', 1), - ('user2@test.test', 'abc2', 'user 2', 0), - ('user3@test.test', 'abc3', 'user 3', 0), - ('user4@test.test', 'abc4', 'user 4', 0) - "); - - $this->connection->exec(" - INSERT INTO `secrets` (`name`, `value`, `create_date`, `user_id`) VALUES - ('secret 1', 'value 1', '2014-01-01 01:01:00', 1), - ('secret 2', 'value 2', '2015-01-01 01:01:00', 1), - ('secret 3', 'value 3', '2016-01-01 01:01:00', 1), - ('secret 4', 'value 4', '2017-01-01 01:01:00', 1), - ('secret 5', 'value 5', '2018-01-01 01:01:00', 2), - ('secret 6', 'value 6', '2018-02-01 01:01:00', 3), - ('secret 7', 'value 7', '2018-03-01 01:01:00', 4) - "); - } catch (\Throwable $e) { - //var_dump($e); - - $this->connection = null; - } - - $this->getConnection(); - - $configuration = new ArrayConfiguration($configurationArray); - $databaseManager = new DatabaseManager($configuration); - $this->storeRegistry = new StoreRegistry($databaseManager); - - $this->store = new SecretStore($databaseManager, $this->storeRegistry); - } - - protected function tearDown(): void - { - parent::tearDown(); - - if (null !== $this->connection) { - $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); - $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); - $this->connection->exec('DROP TABLE IF EXISTS `builds`'); - $this->connection->exec('DROP TABLE IF EXISTS `environments`'); - $this->connection->exec('DROP TABLE IF EXISTS `projects`'); - $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); - $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); - $this->connection->exec('DROP TABLE IF EXISTS `users`'); - - $this->connection = null; - } - } - - protected function getConnection(): ?\PDO - { - if (null === $this->connection) { - $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); - } - - return $this->connection; + [ + 'name' => 'secret 3', + 'value' => 'value 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'name' => 'secret 4', + 'value' => 'value 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'name' => 'secret 5', + 'value' => 'value 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'name' => 'secret 6', + 'value' => 'value 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'name' => 'secret 7', + 'value' => 'value 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; } public function testGetByNamesSuccess(): void diff --git a/tests/src/Store/SecretStorePostgresTest.php b/tests/src/Store/SecretStorePostgresTest.php index d2e142008..ae6d3788e 100644 --- a/tests/src/Store/SecretStorePostgresTest.php +++ b/tests/src/Store/SecretStorePostgresTest.php @@ -4,154 +4,96 @@ namespace Tests\PHPCensor\Store; -use Phinx\Config\Config as PhinxConfig; -use Phinx\Console\Command\Migrate; -use PHPCensor\ArrayConfiguration; -use PHPCensor\DatabaseManager; use PHPCensor\Model\Secret; use PHPCensor\Store; use PHPCensor\Store\SecretStore; -use PHPCensor\StoreRegistry; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Output\ConsoleOutput; -use Symfony\Component\Console\Output\OutputInterface; +use Tests\PHPCensor\BasePostgresTestCase; -class SecretStorePostgresTest extends TestCase +class SecretStorePostgresTest extends BasePostgresTestCase { - private ?\PDO $connection = null; - - private StoreRegistry $storeRegistry; private Store $store; protected function setUp(): void { parent::setUp(); - $configurationArray = [ - 'php-censor' => [ - 'database' => [ - 'servers' => [ - 'read' => [ - ['host' => '127.0.0.1'], - ], - 'write' => [ - ['host' => '127.0.0.1'], - ], - ], - 'type' => 'pgsql', - 'name' => env('POSTGRESQL_DBNAME'), - 'username' => env('POSTGRESQL_USER'), - 'password' => env('POSTGRESQL_PASSWORD'), + $this->store = new SecretStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, ], ], - ]; - - try { - $this->connection = new \PDO( - 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), - env('POSTGRESQL_USER'), - env('POSTGRESQL_PASSWORD') - ); - - $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); - $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); - $this->connection->exec('DROP TABLE IF EXISTS "builds"'); - $this->connection->exec('DROP TABLE IF EXISTS "environments"'); - $this->connection->exec('DROP TABLE IF EXISTS "projects"'); - $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); - $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); - $this->connection->exec('DROP TABLE IF EXISTS "users"'); - - $phinxSettings = [ - 'paths' => [ - 'migrations' => ROOT_DIR . 'src/Migrations', + 'secrets' => [ + [ + 'name' => 'secret 1', + 'value' => 'value 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, ], - 'environments' => [ - 'default_migration_table' => 'migrations', - 'default_database' => 'php-censor', - 'php-censor' => [ - 'adapter' => 'pgsql', - 'host' => '127.0.0.1', - 'name' => env('POSTGRESQL_DBNAME'), - 'user' => env('POSTGRESQL_USER'), - 'pass' => env('POSTGRESQL_PASSWORD'), - ], + [ + 'name' => 'secret 2', + 'value' => 'value 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, ], - ]; - $phinxConfig = new PhinxConfig($phinxSettings); - - try { - (new Migrate()) - ->setConfig($phinxConfig) - ->setName('php-censor-migrations:migrate') - ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); - } catch (\Throwable $e) { - //var_dump($e); - } - - $this->connection->exec(" - INSERT INTO \"users\" (\"email\", \"hash\", \"name\", \"is_admin\") VALUES - ('user1@test.test', 'abc1', 'user 1', 1), - ('user2@test.test', 'abc2', 'user 2', 0), - ('user3@test.test', 'abc3', 'user 3', 0), - ('user4@test.test', 'abc4', 'user 4', 0) - "); - - $this->connection->exec(" - INSERT INTO \"secrets\" (\"name\", \"value\", \"create_date\", \"user_id\") VALUES - ('secret 1', 'value 1', '2014-01-01 01:01:00', 1), - ('secret 2', 'value 2', '2015-01-01 01:01:00', 1), - ('secret 3', 'value 3', '2016-01-01 01:01:00', 1), - ('secret 4', 'value 4', '2017-01-01 01:01:00', 1), - ('secret 5', 'value 5', '2018-01-01 01:01:00', 2), - ('secret 6', 'value 6', '2018-02-01 01:01:00', 3), - ('secret 7', 'value 7', '2018-03-01 01:01:00', 4) - "); - } catch (\Throwable $e) { - //var_dump($e); - - $this->connection = null; - } - - $this->getConnection(); - - $configuration = new ArrayConfiguration($configurationArray); - $databaseManager = new DatabaseManager($configuration); - $this->storeRegistry = new StoreRegistry($databaseManager); - - $this->store = new SecretStore($databaseManager, $this->storeRegistry); - } - - protected function tearDown(): void - { - parent::tearDown(); - - if (null !== $this->connection) { - $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); - $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); - $this->connection->exec('DROP TABLE IF EXISTS "builds"'); - $this->connection->exec('DROP TABLE IF EXISTS "environments"'); - $this->connection->exec('DROP TABLE IF EXISTS "projects"'); - $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); - $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); - $this->connection->exec('DROP TABLE IF EXISTS "users"'); - - $this->connection = null; - } - } - - protected function getConnection(): ?\PDO - { - if (null === $this->connection) { - $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); - } - - return $this->connection; + [ + 'name' => 'secret 3', + 'value' => 'value 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'name' => 'secret 4', + 'value' => 'value 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'name' => 'secret 5', + 'value' => 'value 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'name' => 'secret 6', + 'value' => 'value 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'name' => 'secret 7', + 'value' => 'value 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; } public function testGetByNamesSuccess(): void diff --git a/tests/src/StoreMysqlTest.php b/tests/src/StoreMysqlTest.php index c0eaa97ef..6e7d026c5 100644 --- a/tests/src/StoreMysqlTest.php +++ b/tests/src/StoreMysqlTest.php @@ -4,156 +4,90 @@ namespace Tests\PHPCensor; -use Phinx\Config\Config as PhinxConfig; -use Phinx\Console\Command\Migrate; -use PHPCensor\ArrayConfiguration; use PHPCensor\Common\Exception\InvalidArgumentException; -use PHPCensor\DatabaseManager; use PHPCensor\Model\Project; use PHPCensor\Model\ProjectGroup; use PHPCensor\Store; use PHPCensor\Store\ProjectGroupStore; -use PHPCensor\StoreRegistry; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Output\ConsoleOutput; -use Symfony\Component\Console\Output\OutputInterface; -class StoreMysqlTest extends TestCase +class StoreMysqlTest extends BaseMysqlTestCase { - private ?\PDO $connection = null; - - private StoreRegistry $storeRegistry; private Store $store; protected function setUp(): void { parent::setUp(); - $configurationArray = [ - 'php-censor' => [ - 'database' => [ - 'servers' => [ - 'read' => [ - ['host' => '127.0.0.1'], - ], - 'write' => [ - ['host' => '127.0.0.1'], - ], - ], - 'type' => 'mysql', - 'name' => env('MYSQL_DBNAME'), - 'username' => env('MYSQL_USER'), - 'password' => env('MYSQL_PASSWORD'), + $this->store = new ProjectGroupStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, ], ], - ]; - - try { - $this->connection = new \PDO( - 'mysql:host=127.0.0.1;dbname=' . env('MYSQL_DBNAME'), - env('MYSQL_USER'), - env('MYSQL_PASSWORD') - ); - - $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); - $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); - $this->connection->exec('DROP TABLE IF EXISTS `builds`'); - $this->connection->exec('DROP TABLE IF EXISTS `environments`'); - $this->connection->exec('DROP TABLE IF EXISTS `projects`'); - $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); - $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); - $this->connection->exec('DROP TABLE IF EXISTS `users`'); - - $phinxSettings = [ - 'paths' => [ - 'migrations' => ROOT_DIR . 'src/Migrations', + 'project_groups' => [ + [ + 'title' => 'group 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, ], - 'environments' => [ - 'default_migration_table' => 'migrations', - 'default_database' => 'php-censor', - 'php-censor' => [ - 'adapter' => 'mysql', - 'host' => '127.0.0.1', - 'name' => env('MYSQL_DBNAME'), - 'user' => env('MYSQL_USER'), - 'pass' => env('MYSQL_PASSWORD'), - ], + [ + 'title' => 'group 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, ], - ]; - $phinxConfig = new PhinxConfig($phinxSettings); - - try { - (new Migrate()) - ->setConfig($phinxConfig) - ->setName('php-censor-migrations:migrate') - ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); - } catch (\Throwable $e) { - //var_dump($e); - } - - $this->connection->exec(" - INSERT INTO `users` (`email`, `hash`, `name`, `is_admin`) VALUES - ('user1@test.test', 'abc1', 'user 1', 1), - ('user2@test.test', 'abc2', 'user 2', 0), - ('user3@test.test', 'abc3', 'user 3', 0), - ('user4@test.test', 'abc4', 'user 4', 0) - "); - - $this->connection->exec(" - INSERT INTO `project_groups` (`title`, `create_date`, `user_id`) VALUES - ('group 1', '2014-01-01 01:01:00', 1), - ('group 2', '2015-01-01 01:01:00', 1), - ('group 3', '2016-01-01 01:01:00', 1), - ('group 4', '2017-01-01 01:01:00', 1), - ('group 5', '2018-01-01 01:01:00', 2), - ('group 6', '2018-02-01 01:01:00', 3), - ('group 7', '2018-03-01 01:01:00', 4) - "); - } catch (\Throwable $e) { - //var_dump($e); - - $this->connection = null; - } - - $this->getConnection(); - - $configuration = new ArrayConfiguration($configurationArray); - $databaseManager = new DatabaseManager($configuration); - $this->storeRegistry = new StoreRegistry($databaseManager); - - $this->store = new ProjectGroupStore($databaseManager, $this->storeRegistry); - } - - protected function tearDown(): void - { - parent::tearDown(); - - if (null !== $this->connection) { - $this->connection->exec('DROP TABLE IF EXISTS `migrations`'); - $this->connection->exec('DROP TABLE IF EXISTS `webhook_requests`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_errors`'); - $this->connection->exec('DROP TABLE IF EXISTS `build_metas`'); - $this->connection->exec('DROP TABLE IF EXISTS `builds`'); - $this->connection->exec('DROP TABLE IF EXISTS `environments`'); - $this->connection->exec('DROP TABLE IF EXISTS `projects`'); - $this->connection->exec('DROP TABLE IF EXISTS `project_groups`'); - $this->connection->exec('DROP TABLE IF EXISTS `secrets`'); - $this->connection->exec('DROP TABLE IF EXISTS `users`'); - - $this->connection = null; - } - } - - protected function getConnection(): ?\PDO - { - if (null === $this->connection) { - $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); - } - - return $this->connection; + [ + 'title' => 'group 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'title' => 'group 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'title' => 'group 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; } public function testGetByIdSuccess(): void diff --git a/tests/src/StorePostgresTest.php b/tests/src/StorePostgresTest.php index ddc5022b6..dbfb5e9be 100644 --- a/tests/src/StorePostgresTest.php +++ b/tests/src/StorePostgresTest.php @@ -4,156 +4,90 @@ namespace Tests\PHPCensor; -use Phinx\Config\Config as PhinxConfig; -use Phinx\Console\Command\Migrate; -use PHPCensor\ArrayConfiguration; use PHPCensor\Common\Exception\InvalidArgumentException; -use PHPCensor\DatabaseManager; use PHPCensor\Model\Project; use PHPCensor\Model\ProjectGroup; use PHPCensor\Store; use PHPCensor\Store\ProjectGroupStore; -use PHPCensor\StoreRegistry; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Output\ConsoleOutput; -use Symfony\Component\Console\Output\OutputInterface; -class StorePostgresTest extends TestCase +class StorePostgresTest extends BasePostgresTestCase { - private ?\PDO $connection = null; - - private StoreRegistry $storeRegistry; private Store $store; protected function setUp(): void { parent::setUp(); - $configurationArray = [ - 'php-censor' => [ - 'database' => [ - 'servers' => [ - 'read' => [ - ['host' => '127.0.0.1'], - ], - 'write' => [ - ['host' => '127.0.0.1'], - ], - ], - 'type' => 'pgsql', - 'name' => env('POSTGRESQL_DBNAME'), - 'username' => env('POSTGRESQL_USER'), - 'password' => env('POSTGRESQL_PASSWORD'), + $this->store = new ProjectGroupStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, ], ], - ]; - - try { - $this->connection = new \PDO( - 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), - env('POSTGRESQL_USER'), - env('POSTGRESQL_PASSWORD') - ); - - $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); - $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); - $this->connection->exec('DROP TABLE IF EXISTS "builds"'); - $this->connection->exec('DROP TABLE IF EXISTS "environments"'); - $this->connection->exec('DROP TABLE IF EXISTS "projects"'); - $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); - $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); - $this->connection->exec('DROP TABLE IF EXISTS "users"'); - - $phinxSettings = [ - 'paths' => [ - 'migrations' => ROOT_DIR . 'src/Migrations', + 'project_groups' => [ + [ + 'title' => 'group 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, ], - 'environments' => [ - 'default_migration_table' => 'migrations', - 'default_database' => 'php-censor', - 'php-censor' => [ - 'adapter' => 'pgsql', - 'host' => '127.0.0.1', - 'name' => env('POSTGRESQL_DBNAME'), - 'user' => env('POSTGRESQL_USER'), - 'pass' => env('POSTGRESQL_PASSWORD'), - ], + [ + 'title' => 'group 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, ], - ]; - $phinxConfig = new PhinxConfig($phinxSettings); - - try { - (new Migrate()) - ->setConfig($phinxConfig) - ->setName('php-censor-migrations:migrate') - ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); - } catch (\Throwable $e) { - //var_dump($e); - } - - $this->connection->exec(" - INSERT INTO \"users\" (\"email\", \"hash\", \"name\", \"is_admin\") VALUES - ('user1@test.test', 'abc1', 'user 1', 1), - ('user2@test.test', 'abc2', 'user 2', 0), - ('user3@test.test', 'abc3', 'user 3', 0), - ('user4@test.test', 'abc4', 'user 4', 0) - "); - - $this->connection->exec(" - INSERT INTO \"project_groups\" (\"title\", \"create_date\", \"user_id\") VALUES - ('group 1', '2014-01-01 01:01:00', 1), - ('group 2', '2015-01-01 01:01:00', 1), - ('group 3', '2016-01-01 01:01:00', 1), - ('group 4', '2017-01-01 01:01:00', 1), - ('group 5', '2018-01-01 01:01:00', 2), - ('group 6', '2018-02-01 01:01:00', 3), - ('group 7', '2018-03-01 01:01:00', 4) - "); - } catch (\Throwable $e) { - //var_dump($e); - - $this->connection = null; - } - - $this->getConnection(); - - $configuration = new ArrayConfiguration($configurationArray); - $databaseManager = new DatabaseManager($configuration); - $this->storeRegistry = new StoreRegistry($databaseManager); - - $this->store = new ProjectGroupStore($databaseManager, $this->storeRegistry); - } - - protected function tearDown(): void - { - parent::tearDown(); - - if (null !== $this->connection) { - $this->connection->exec('DROP TABLE IF EXISTS "migrations"'); - $this->connection->exec('DROP TABLE IF EXISTS "webhook_requests"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_errors"'); - $this->connection->exec('DROP TABLE IF EXISTS "build_metas"'); - $this->connection->exec('DROP TABLE IF EXISTS "builds"'); - $this->connection->exec('DROP TABLE IF EXISTS "environments"'); - $this->connection->exec('DROP TABLE IF EXISTS "projects"'); - $this->connection->exec('DROP TABLE IF EXISTS "project_groups"'); - $this->connection->exec('DROP TABLE IF EXISTS "secrets"'); - $this->connection->exec('DROP TABLE IF EXISTS "users"'); - - $this->connection = null; - } - } - - protected function getConnection(): ?\PDO - { - if (null === $this->connection) { - $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); - } - - return $this->connection; + [ + 'title' => 'group 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'title' => 'group 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'title' => 'group 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; } public function testGetByIdSuccess(): void From ac2370cc273797aed99379306088021437ffe107 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 17 Jun 2022 23:35:36 +0700 Subject: [PATCH 142/212] Added DB tests for ProjectGroup. --- .../src/Store/ProjectGroupStoreMysqlTest.php | 110 ++++++++++++++++++ .../Store/ProjectGroupStorePostgresTest.php | 110 ++++++++++++++++++ 2 files changed, 220 insertions(+) create mode 100644 tests/src/Store/ProjectGroupStoreMysqlTest.php create mode 100644 tests/src/Store/ProjectGroupStorePostgresTest.php diff --git a/tests/src/Store/ProjectGroupStoreMysqlTest.php b/tests/src/Store/ProjectGroupStoreMysqlTest.php new file mode 100644 index 000000000..044cd966c --- /dev/null +++ b/tests/src/Store/ProjectGroupStoreMysqlTest.php @@ -0,0 +1,110 @@ +store = new ProjectGroupStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, + ], + ], + 'project_groups' => [ + [ + 'title' => 'group 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'title' => 'group 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'title' => 'group 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; + } + + public function testGetByTitleSuccess(): void + { + /** @var ProjectGroup $newModel */ + $model = $this->store->getByTitle('group 5'); + + self::assertInstanceOf(ProjectGroup::class, $model); + self::assertEquals(5, $model->getId()); + self::assertEquals('group 5', $model->getTitle()); + self::assertEquals(2, $model->getUserId()); + } + + public function testGetByTitleFailed(): void + { + /** @var ProjectGroup $newModel */ + $model = $this->store->getByTitle('group 10'); + + self::assertEquals(null, $model); + } +} diff --git a/tests/src/Store/ProjectGroupStorePostgresTest.php b/tests/src/Store/ProjectGroupStorePostgresTest.php new file mode 100644 index 000000000..53df57082 --- /dev/null +++ b/tests/src/Store/ProjectGroupStorePostgresTest.php @@ -0,0 +1,110 @@ +store = new ProjectGroupStore($this->databaseManager, $this->storeRegistry); + } + + protected function getTestData(): array + { + return [ + 'users' => [ + [ + 'email' => 'user1@test.test', + 'hash' => 'abc1', + 'name' => 'user 1', + 'is_admin' => 1, + ], + [ + 'email' => 'user2@test.test', + 'hash' => 'abc2', + 'name' => 'user 2', + 'is_admin' => 0, + ], + [ + 'email' => 'user3@test.test', + 'hash' => 'abc3', + 'name' => 'user 3', + 'is_admin' => 0, + ], + [ + 'email' => 'user4@test.test', + 'hash' => 'abc4', + 'name' => 'user 4', + 'is_admin' => 0, + ], + ], + 'project_groups' => [ + [ + 'title' => 'group 1', + 'create_date' => '2014-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 2', + 'create_date' => '2015-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 3', + 'create_date' => '2016-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 4', + 'create_date' => '2017-01-01 01:01:00', + 'user_id' => 1, + ], + [ + 'title' => 'group 5', + 'create_date' => '2018-01-01 01:01:00', + 'user_id' => 2, + ], + [ + 'title' => 'group 6', + 'create_date' => '2018-02-01 01:01:00', + 'user_id' => 3, + ], + [ + 'title' => 'group 7', + 'create_date' => '2018-03-01 01:01:00', + 'user_id' => 4, + ], + ], + ]; + } + + public function testGetByTitleSuccess(): void + { + /** @var ProjectGroup $newModel */ + $model = $this->store->getByTitle('group 5'); + + self::assertInstanceOf(ProjectGroup::class, $model); + self::assertEquals(5, $model->getId()); + self::assertEquals('group 5', $model->getTitle()); + self::assertEquals(2, $model->getUserId()); + } + + public function testGetByTitleFailed(): void + { + /** @var ProjectGroup $newModel */ + $model = $this->store->getByTitle('group 10'); + + self::assertEquals(null, $model); + } +} From 15d07790f54da525ad8dfbf1600562737af09ca2 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 17 Jun 2022 23:36:15 +0700 Subject: [PATCH 143/212] Added Psalm analyzing. --- composer.json | 3 +- composer.lock | 590 ++++++++++++++++++++++++++++++++++++++++++++++++- psalm.xml.dist | 15 ++ 3 files changed, 606 insertions(+), 2 deletions(-) create mode 100644 psalm.xml.dist diff --git a/composer.json b/composer.json index ba2b0d8ad..9356be303 100644 --- a/composer.json +++ b/composer.json @@ -96,7 +96,8 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "php-censor/phpdoc-checker": "^3.0", "friendsofphp/php-cs-fixer": "^3.3", - "symfony/var-dumper": "^4.4" + "symfony/var-dumper": "^4.4", + "vimeo/psalm": "^4.23" }, "extra": { "platform": { diff --git a/composer.lock b/composer.lock index 2a77db816..05e053bfd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2b3f33d7f7f0136209897f2f70d4059f", + "content-hash": "b0c9820687d3afb4c7446991862b3f44", "packages": [ { "name": "cakephp/core", @@ -4509,6 +4509,245 @@ } ], "packages-dev": [ + { + "name": "amphp/amp", + "version": "v2.6.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/amp.git", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ], + "psr-4": { + "Amp\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "https://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.2" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-02-20T17:52:18+00:00" + }, + { + "name": "amphp/byte-stream", + "version": "v1.8.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Amp\\ByteStream\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-03-30T17:13:30+00:00" + }, + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.5", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-17T14:14:24+00:00" + }, { "name": "composer/pcre", "version": "1.0.1", @@ -4727,6 +4966,43 @@ ], "time": "2022-02-24T20:20:32+00:00" }, + { + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", + "source": { + "type": "git", + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "XdgBaseDir\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, + "time": "2019-12-04T15:06:13+00:00" + }, { "name": "doctrine/annotations", "version": "1.13.2", @@ -4869,6 +5145,107 @@ ], "time": "2022-03-03T08:28:38+00:00" }, + { + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "shasum": "" + }, + "require": { + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "A more advanced JSONRPC implementation", + "support": { + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" + }, + "time": "2021-06-11T22:34:44+00:00" + }, + { + "name": "felixfbecker/language-server-protocol", + "version": "v1.5.2", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "LanguageServerProtocol\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], + "support": { + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2" + }, + "time": "2022-03-02T22:36:06+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v3.4.0", @@ -5390,6 +5767,57 @@ ], "time": "2022-03-03T13:19:32+00:00" }, + { + "name": "netresearch/jsonmapper", + "version": "v4.0.0", + "source": { + "type": "git", + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "squizlabs/php_codesniffer": "~3.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonMapper": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" + } + ], + "description": "Map nested JSON structures onto PHP classes", + "support": { + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + }, + "time": "2020-12-01T19:48:11+00:00" + }, { "name": "nikic/php-parser", "version": "v4.14.0", @@ -5518,6 +5946,59 @@ }, "time": "2020-09-04T11:21:14+00:00" }, + { + "name": "openlss/lib-array2xml", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "LSS": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Bryan Tong", + "email": "bryan@nullivex.com", + "homepage": "https://www.nullivex.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "https://www.nullivex.com" + } + ], + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "https://www.nullivex.com", + "keywords": [ + "array", + "array conversion", + "xml", + "xml conversion" + ], + "support": { + "issues": "https://github.com/nullivex/lib-array2xml/issues", + "source": "https://github.com/nullivex/lib-array2xml/tree/master" + }, + "time": "2019-03-29T20:06:56+00:00" + }, { "name": "pdepend/pdepend", "version": "2.10.3", @@ -8324,6 +8805,113 @@ ], "time": "2021-07-28T10:34:58+00:00" }, + { + "name": "vimeo/psalm", + "version": "4.23.0", + "source": { + "type": "git", + "url": "https://github.com/vimeo/psalm.git", + "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1fe6ff483bf325c803df9f510d09a03fd796f88", + "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.4.2", + "amphp/byte-stream": "^1.5", + "composer/package-versions-deprecated": "^1.8.0", + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0", + "dnoegel/php-xdg-base-dir": "^0.1.1", + "ext-ctype": "*", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "felixfbecker/advanced-json-rpc": "^3.0.3", + "felixfbecker/language-server-protocol": "^1.5", + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "nikic/php-parser": "^4.13", + "openlss/lib-array2xml": "^1.0", + "php": "^7.1|^8", + "sebastian/diff": "^3.0 || ^4.0", + "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.25", + "webmozart/path-util": "^2.3" + }, + "provide": { + "psalm/psalm": "self.version" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.2", + "brianium/paratest": "^4.0||^6.0", + "ext-curl": "*", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpdocumentor/reflection-docblock": "^5", + "phpmyadmin/sql-parser": "5.1.0||dev-master", + "phpspec/prophecy": ">=1.9.0", + "phpunit/phpunit": "^9.0", + "psalm/plugin-phpunit": "^0.16", + "slevomat/coding-standard": "^7.0", + "squizlabs/php_codesniffer": "^3.5", + "symfony/process": "^4.3 || ^5.0 || ^6.0", + "weirdan/prophecy-shim": "^1.0 || ^2.0" + }, + "suggest": { + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" + }, + "bin": [ + "psalm", + "psalm-language-server", + "psalm-plugin", + "psalm-refactor", + "psalter" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev", + "dev-3.x": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php", + "src/spl_object_id.php" + ], + "psr-4": { + "Psalm\\": "src/Psalm/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Brown" + } + ], + "description": "A static analysis tool for finding errors in PHP applications", + "keywords": [ + "code", + "inspection", + "php" + ], + "support": { + "issues": "https://github.com/vimeo/psalm/issues", + "source": "https://github.com/vimeo/psalm/tree/4.23.0" + }, + "time": "2022-04-28T17:35:49+00:00" + }, { "name": "webmozart/assert", "version": "1.11.0", diff --git a/psalm.xml.dist b/psalm.xml.dist new file mode 100644 index 000000000..4e9226bdb --- /dev/null +++ b/psalm.xml.dist @@ -0,0 +1,15 @@ + + + + + + + + + From 673d751aac499ece7f96e31943c2e27f3d27c1b0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 18 Jun 2022 01:16:49 +0700 Subject: [PATCH 144/212] Fixed color of new error trend. --- src/Model/Build.php | 8 ++++---- src/View/Project/ajax-builds.phtml | 2 +- src/View/WidgetLastBuilds/update.phtml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Model/Build.php b/src/Model/Build.php index a31b8673c..c145925d9 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -627,8 +627,8 @@ public function getErrorsTrend(): array if (null === $previous) { return [ - 'trend' => 0, - 'delta' => 0, + 'trend' => -1, + 'delta' => $total, ]; } @@ -661,8 +661,8 @@ public function getTestCoverageTrend(): array if (null === $previous) { return [ - 'trend' => 0, - 'delta' => '0.00', + 'trend' => -1, + 'delta' => $total, ]; } diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml index b28f4544f..16f875354 100644 --- a/src/View/Project/ajax-builds.phtml +++ b/src/View/Project/ajax-builds.phtml @@ -122,7 +122,7 @@ $branches = $build->getExtra('branches');

          		• getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> - getErrorsNew(); ?> + getErrorsNew(); ?> diff --git a/src/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml index 4e91a283f..f996487cb 100644 --- a/src/View/WidgetLastBuilds/update.phtml +++ b/src/View/WidgetLastBuilds/update.phtml @@ -149,7 +149,7 @@ use PHPCensor\Store\EnvironmentStore; getErrorsNew()): ?> / : - + | From c24f331c27843235fbdfe01ed86ffb801f4f3018 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 19 Jun 2022 15:16:57 +0700 Subject: [PATCH 145/212] Fixed classes names in tests. --- src/Application.php | 2 +- src/Builder.php | 3 +- src/Helper/Xml.php | 3 +- src/Model/Build.php | 5 +-- src/Plugin/Util/Executor.php | 2 +- src/StoreRegistry.php | 2 +- tests/src/Command/CreateAdminCommandTest.php | 12 ++++--- tests/src/Command/CreateBuildCommandTest.php | 16 +++++---- tests/src/Helper/BuildInterpolatorTest.php | 7 ++-- tests/src/Helper/CommandExecutorTest.php | 5 +-- tests/src/Logging/BuildLoggerTest.php | 6 ++-- tests/src/Model/Base/BuildErrorTest.php | 10 +++--- tests/src/Model/Base/BuildMetaTest.php | 10 +++--- tests/src/Model/Base/BuildTest.php | 14 ++++---- tests/src/Model/Base/EnvironmentTest.php | 10 +++--- tests/src/Model/Base/ProjectGroupTest.php | 10 +++--- tests/src/Model/Base/ProjectTest.php | 13 +++++--- tests/src/Model/Base/UserTest.php | 10 +++--- tests/src/Model/Base/WebhookRequestTest.php | 10 +++--- tests/src/Model/BuildTest.php | 12 ++++--- tests/src/Model/ProjectTest.php | 5 +-- tests/src/Plugin/CopyBuildTest.php | 7 ++-- tests/src/Plugin/EmailTest.php | 13 ++++---- tests/src/Plugin/PharTest.php | 12 ++++--- tests/src/Plugin/Util/ExecutorTest.php | 33 +++++++++++-------- tests/src/PluginTest.php | 7 ++-- .../Security/Authentication/ServiceTest.php | 22 ++++++++----- .../UserProvider/InternalTest.php | 5 +-- tests/src/Service/BuildServiceTest.php | 22 +++++++------ tests/src/Service/BuildStatusServiceTest.php | 7 ++-- tests/src/Service/ProjectServiceTest.php | 8 ++--- tests/src/Service/UserServiceTest.php | 8 ++--- 32 files changed, 180 insertions(+), 131 deletions(-) diff --git a/src/Application.php b/src/Application.php index 2e92f5db2..06671d409 100644 --- a/src/Application.php +++ b/src/Application.php @@ -240,7 +240,7 @@ protected function getControllerClass(array $route): string { $controller = $this->toPhpName($route['controller']); - return 'PHPCensor\\Controller\\' . $controller . 'Controller'; + return 'PHPCensor\Controller\\' . $controller . 'Controller'; } public function isValidRoute(array $route): bool diff --git a/src/Builder.php b/src/Builder.php index 980f49928..b8692ba77 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -8,6 +8,7 @@ use Exception; use PHPCensor\Common\Exception\RuntimeException; use PHPCensor\Helper\BuildInterpolator; +use PHPCensor\Helper\CommandExecutor; use PHPCensor\Helper\CommandExecutorInterface; use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; @@ -103,7 +104,7 @@ public function __construct( $buildStore ); - $executorClass = 'PHPCensor\Helper\CommandExecutor'; + $executorClass = CommandExecutor::class; $this->commandExecutor = new $executorClass( $this->buildLogger, ROOT_DIR, diff --git a/src/Helper/Xml.php b/src/Helper/Xml.php index 704b403f4..819a42f1a 100644 --- a/src/Helper/Xml.php +++ b/src/Helper/Xml.php @@ -5,6 +5,7 @@ use DOMDocument; use Exception; use LibXMLError; +use PHPCensor\Helper\Xml\Utf8CleanFilter; use SimpleXMLElement; /** @@ -22,7 +23,7 @@ class Xml */ public static function loadFromFile($filePath) { - \stream_filter_register('xml_utf8_clean', 'PHPCensor\Helper\Xml\Utf8CleanFilter'); + \stream_filter_register('xml_utf8_clean', Utf8CleanFilter::class); try { $xml = \simplexml_load_file('php://filter/read=xml_utf8_clean/resource=' . $filePath); diff --git a/src/Model/Build.php b/src/Model/Build.php index c145925d9..da644b295 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -15,6 +15,7 @@ use PHPCensor\Plugin\PhpParallelLint; use PHPCensor\Store\BuildErrorStore; use PHPCensor\Store\ProjectStore; +use PHPCensor\ZeroConfigPluginInterface; use ReflectionClass; use ReflectionException; use Symfony\Component\Filesystem\Filesystem; @@ -295,11 +296,11 @@ protected function getZeroConfigPlugins() continue; } - $className = '\PHPCensor\Plugin\\' . $item->getBasename('.php'); + $className = 'PHPCensor\Plugin\\' . $item->getBasename('.php'); $reflectedPlugin = new ReflectionClass($className); - if (!$reflectedPlugin->implementsInterface('\PHPCensor\ZeroConfigPluginInterface')) { + if (!$reflectedPlugin->implementsInterface(ZeroConfigPluginInterface::class)) { continue; } diff --git a/src/Plugin/Util/Executor.php b/src/Plugin/Util/Executor.php index 62266fa1e..55ea9b66c 100644 --- a/src/Plugin/Util/Executor.php +++ b/src/Plugin/Util/Executor.php @@ -227,7 +227,7 @@ public function executePlugin($plugin, $options) if (!\class_exists($class)) { $class = \str_replace('_', ' ', $plugin); $class = \ucwords($class); - $class = 'PHPCensor\\Plugin\\' . \str_replace(' ', '', $class); + $class = 'PHPCensor\Plugin\\' . \str_replace(' ', '', $class); if (!\class_exists($class)) { $this->logger->logFailure(\sprintf('Plugin does not exist: %s', $plugin)); diff --git a/src/StoreRegistry.php b/src/StoreRegistry.php index e399ad9de..4b8eb968a 100644 --- a/src/StoreRegistry.php +++ b/src/StoreRegistry.php @@ -35,7 +35,7 @@ public function get(string $storeName): Store { if (!isset($this->loadedStores[$storeName])) { try { - $class = 'PHPCensor\\Store\\' . $storeName . 'Store'; + $class = 'PHPCensor\Store\\' . $storeName . 'Store'; $store = new $class($this->databaseManager, $this); $this->loadedStores[$storeName] = $store; diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index a5a579b50..e17868023 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -8,6 +8,8 @@ use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Common\Application\ConfigurationInterface; use PHPCensor\DatabaseManager; +use PHPCensor\Store\UserStore; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Application; use Symfony\Component\Console\Helper\QuestionHelper; @@ -28,25 +30,25 @@ protected function setUp(): void $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Monolog\Logger') + $this->logger = $this->getMockBuilder(Logger::class) ->setConstructorArgs(['logger']) ->getMock(); $userStoreMock = $this - ->getMockBuilder('PHPCensor\Store\UserStore') + ->getMockBuilder(UserStore::class) ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $userStoreMock); $this->helper = $this - ->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper') + ->getMockBuilder(QuestionHelper::class) ->onlyMethods(['ask']) ->getMock(); diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index 34467dd68..b60ceae6a 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -9,6 +9,10 @@ use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\Common\Application\ConfigurationInterface; use PHPCensor\DatabaseManager; +use PHPCensor\Model\Project; +use PHPCensor\Service\BuildService; +use PHPCensor\Store\ProjectStore; +use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; @@ -27,24 +31,24 @@ protected function setUp(): void $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); - $this->logger = $this->getMockBuilder('Monolog\Logger') + $this->logger = $this->getMockBuilder(Logger::class) ->setConstructorArgs(['logger']) ->getMock(); $projectMock = $this - ->getMockBuilder('PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->setConstructorArgs([$storeRegistry]) ->getMock(); $projectStoreMock = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); $projectStoreMock->method('getById') @@ -53,7 +57,7 @@ protected function setUp(): void [2, 'read', null], ])); - $buildServiceMock = $this->getMockBuilder('PHPCensor\Service\BuildService') + $buildServiceMock = $this->getMockBuilder(BuildService::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/src/Helper/BuildInterpolatorTest.php b/tests/src/Helper/BuildInterpolatorTest.php index a379e101d..faa8fd7b9 100644 --- a/tests/src/Helper/BuildInterpolatorTest.php +++ b/tests/src/Helper/BuildInterpolatorTest.php @@ -4,6 +4,7 @@ namespace Tests\PHPCensor\Helper; +use PHPCensor\DatabaseManager; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Store\EnvironmentStore; @@ -27,11 +28,11 @@ protected function setUp(): void $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); @@ -61,7 +62,7 @@ public function testInterpolate_LeavesStringsUnchangedByDefault(): void public function testInterpolate_LeavesStringsUnchangedWhenBuildIsSet(): void { /** @var Build $build */ - $build = $this->prophesize('PHPCensor\\Model\\Build')->reveal(); + $build = $this->prophesize(Build::class)->reveal(); $string = "Hello World"; $expectedOutput = "Hello World"; diff --git a/tests/src/Helper/CommandExecutorTest.php b/tests/src/Helper/CommandExecutorTest.php index 4da391181..b0b6f1f16 100644 --- a/tests/src/Helper/CommandExecutorTest.php +++ b/tests/src/Helper/CommandExecutorTest.php @@ -6,6 +6,7 @@ use Exception; use PHPCensor\Helper\CommandExecutor; +use PHPCensor\Logging\BuildLogger; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; @@ -19,9 +20,9 @@ protected function setUp(): void { parent::setUp(); - $buildLogger = $this->prophesize('PHPCensor\Logging\BuildLogger'); + $buildLogger = $this->prophesize(BuildLogger::class); - $class = 'PHPCensor\Helper\CommandExecutor'; + $class = CommandExecutor::class; $this->testedExecutor = new $class($buildLogger->reveal(), __DIR__); } diff --git a/tests/src/Logging/BuildLoggerTest.php b/tests/src/Logging/BuildLoggerTest.php index e8fcbc6be..405d5d96c 100644 --- a/tests/src/Logging/BuildLoggerTest.php +++ b/tests/src/Logging/BuildLoggerTest.php @@ -6,9 +6,11 @@ use Exception; use PHPCensor\Logging\BuildLogger; +use PHPCensor\Model\Build; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; +use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; class BuildLoggerTest extends TestCase @@ -23,8 +25,8 @@ protected function setUp(): void { parent::setUp(); - $this->logger = $this->prophesize('\Psr\Log\LoggerInterface'); - $this->build = $this->prophesize('\PHPCensor\Model\Build'); + $this->logger = $this->prophesize(LoggerInterface::class); + $this->build = $this->prophesize(Build::class); $this->testedBuildLogger = new BuildLogger( $this->logger->reveal(), diff --git a/tests/src/Model/Base/BuildErrorTest.php b/tests/src/Model/Base/BuildErrorTest.php index 792055fd9..8e73060a4 100644 --- a/tests/src/Model/Base/BuildErrorTest.php +++ b/tests/src/Model/Base/BuildErrorTest.php @@ -5,6 +5,8 @@ namespace Tests\PHPCensor\Model\Base; use DateTime; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\BuildError; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -18,11 +20,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -31,8 +33,8 @@ public function testConstruct(): void { $buildError = new BuildError($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $buildError); - self::assertInstanceOf('PHPCensor\Model\Base\BuildError', $buildError); + self::assertInstanceOf(Model::class, $buildError); + self::assertInstanceOf(BuildError::class, $buildError); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/Base/BuildMetaTest.php b/tests/src/Model/Base/BuildMetaTest.php index 8cedbb215..aa96afde0 100644 --- a/tests/src/Model/Base/BuildMetaTest.php +++ b/tests/src/Model/Base/BuildMetaTest.php @@ -4,6 +4,8 @@ namespace Tests\PHPCensor\Model\Base; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\BuildMeta; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -17,11 +19,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -30,8 +32,8 @@ public function testConstruct(): void { $buildMeta = new BuildMeta($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $buildMeta); - self::assertInstanceOf('PHPCensor\Model\Base\BuildMeta', $buildMeta); + self::assertInstanceOf(Model::class, $buildMeta); + self::assertInstanceOf(BuildMeta::class, $buildMeta); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/Base/BuildTest.php b/tests/src/Model/Base/BuildTest.php index 26c1d0676..6aa82930d 100644 --- a/tests/src/Model/Base/BuildTest.php +++ b/tests/src/Model/Base/BuildTest.php @@ -6,6 +6,8 @@ use DateTime; use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\Build; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -19,11 +21,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -32,8 +34,8 @@ public function testConstruct(): void { $build = new Build($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $build); - self::assertInstanceOf('PHPCensor\Model\Base\Build', $build); + self::assertInstanceOf(Model::class, $build); + self::assertInstanceOf(Build::class, $build); self::assertEquals([ 'id' => null, @@ -123,7 +125,7 @@ public function testStatus(): void $build->setStatusFailed(); self::assertEquals(Build::STATUS_FAILED, $build->getStatus()); - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); + self::expectException(InvalidArgumentException::class); $build->setStatus(10); } @@ -328,7 +330,7 @@ public function testSource(): void $result = $build->setSource(Build::SOURCE_WEBHOOK_PULL_REQUEST_CREATED); self::assertEquals(false, $result); - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); + self::expectException(InvalidArgumentException::class); $build->setSource(20); } diff --git a/tests/src/Model/Base/EnvironmentTest.php b/tests/src/Model/Base/EnvironmentTest.php index 36ac9f3cc..b0d3cf2a9 100644 --- a/tests/src/Model/Base/EnvironmentTest.php +++ b/tests/src/Model/Base/EnvironmentTest.php @@ -4,6 +4,8 @@ namespace Tests\PHPCensor\Model\Base; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\Environment; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -17,11 +19,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -30,8 +32,8 @@ public function testConstruct(): void { $environment = new Environment($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $environment); - self::assertInstanceOf('PHPCensor\Model\Base\Environment', $environment); + self::assertInstanceOf(Model::class, $environment); + self::assertInstanceOf(Environment::class, $environment); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/Base/ProjectGroupTest.php b/tests/src/Model/Base/ProjectGroupTest.php index dcf56bc65..256bc22b6 100644 --- a/tests/src/Model/Base/ProjectGroupTest.php +++ b/tests/src/Model/Base/ProjectGroupTest.php @@ -5,6 +5,8 @@ namespace Tests\PHPCensor\Model\Base; use DateTime; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\ProjectGroup; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -18,11 +20,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -31,8 +33,8 @@ public function testConstruct(): void { $projectGroup = new ProjectGroup($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $projectGroup); - self::assertInstanceOf('PHPCensor\Model\Base\ProjectGroup', $projectGroup); + self::assertInstanceOf(Model::class, $projectGroup); + self::assertInstanceOf(ProjectGroup::class, $projectGroup); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/Base/ProjectTest.php b/tests/src/Model/Base/ProjectTest.php index 8f3ec518b..d403cc8d3 100644 --- a/tests/src/Model/Base/ProjectTest.php +++ b/tests/src/Model/Base/ProjectTest.php @@ -5,6 +5,9 @@ namespace Tests\PHPCensor\Model\Base; use DateTime; +use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\Project; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -18,11 +21,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -31,8 +34,8 @@ public function testConstruct(): void { $project = new Project($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $project); - self::assertInstanceOf('PHPCensor\Model\Base\Project', $project); + self::assertInstanceOf(Model::class, $project); + self::assertInstanceOf(Project::class, $project); self::assertEquals([ 'id' => null, @@ -151,7 +154,7 @@ public function testType(): void $result = $project->setType('git'); self::assertEquals(false, $result); - self::expectException('\PHPCensor\Common\Exception\InvalidArgumentException'); + self::expectException(InvalidArgumentException::class); $project->setType('invalid-type'); } diff --git a/tests/src/Model/Base/UserTest.php b/tests/src/Model/Base/UserTest.php index 664e37db2..99c75540a 100644 --- a/tests/src/Model/Base/UserTest.php +++ b/tests/src/Model/Base/UserTest.php @@ -4,6 +4,8 @@ namespace Tests\PHPCensor\Model\Base; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\User; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -17,11 +19,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -30,8 +32,8 @@ public function testConstruct(): void { $user = new User($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $user); - self::assertInstanceOf('PHPCensor\Model\Base\User', $user); + self::assertInstanceOf(Model::class, $user); + self::assertInstanceOf(User::class, $user); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/Base/WebhookRequestTest.php b/tests/src/Model/Base/WebhookRequestTest.php index 1299b5331..dd1d9e9bf 100644 --- a/tests/src/Model/Base/WebhookRequestTest.php +++ b/tests/src/Model/Base/WebhookRequestTest.php @@ -5,6 +5,8 @@ namespace Tests\PHPCensor\Model\Base; use DateTime; +use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Base\ProjectGroup; use PHPCensor\Model\Base\WebhookRequest; use PHPCensor\StoreRegistry; @@ -19,11 +21,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -32,8 +34,8 @@ public function testConstruct(): void { $webhookRequest = new WebhookRequest($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $webhookRequest); - self::assertInstanceOf('PHPCensor\Model\Base\WebhookRequest', $webhookRequest); + self::assertInstanceOf(Model::class, $webhookRequest); + self::assertInstanceOf(WebhookRequest::class, $webhookRequest); self::assertEquals([ 'id' => null, diff --git a/tests/src/Model/BuildTest.php b/tests/src/Model/BuildTest.php index a4d819364..43a36b443 100644 --- a/tests/src/Model/BuildTest.php +++ b/tests/src/Model/BuildTest.php @@ -6,6 +6,7 @@ use PHPCensor\Common\Exception\InvalidArgumentException; use PHPCensor\DatabaseManager; +use PHPCensor\Model; use PHPCensor\Model\Build; use PHPCensor\Model\Build\GitBuild; use PHPCensor\Model\Build\GithubBuild; @@ -13,6 +14,7 @@ use PHPCensor\Model\Build\GogsBuild; use PHPCensor\Model\Project; use PHPCensor\Service\ProjectService; +use PHPCensor\Store\ProjectStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use PHPCensor\Common\Application\ConfigurationInterface; @@ -32,16 +34,16 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); $projectStore = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); @@ -52,8 +54,8 @@ public function testConstruct(): void { $build = new Build($this->storeRegistry); - self::assertInstanceOf('PHPCensor\Model', $build); - self::assertInstanceOf('PHPCensor\Model\Build', $build); + self::assertInstanceOf(Model::class, $build); + self::assertInstanceOf(Build::class, $build); $build = new Build($this->storeRegistry, [ 'project_id' => 100, diff --git a/tests/src/Model/ProjectTest.php b/tests/src/Model/ProjectTest.php index 099b491d2..74e2865ee 100644 --- a/tests/src/Model/ProjectTest.php +++ b/tests/src/Model/ProjectTest.php @@ -5,6 +5,7 @@ namespace Tests\PHPCensor\Model; use PHPCensor\Common\Exception\InvalidArgumentException; +use PHPCensor\DatabaseManager; use PHPCensor\Model; use PHPCensor\Model\Project; use PHPCensor\StoreRegistry; @@ -24,11 +25,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } diff --git a/tests/src/Plugin/CopyBuildTest.php b/tests/src/Plugin/CopyBuildTest.php index d5297585a..15716db34 100644 --- a/tests/src/Plugin/CopyBuildTest.php +++ b/tests/src/Plugin/CopyBuildTest.php @@ -6,6 +6,7 @@ use PHPCensor\Builder; use PHPCensor\Helper\CommandExecutor; +use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\CopyBuild; @@ -75,18 +76,18 @@ protected function getPlugin(array $options = []): Plugin { /** @var Build|MockObject $build */ $build = $this - ->getMockBuilder('PHPCensor\Model\Build') + ->getMockBuilder(Build::class) ->disableOriginalConstructor() ->getMock(); /** @var Builder|MockObject $builder */ $builder = $this - ->getMockBuilder('PHPCensor\Builder') + ->getMockBuilder(Builder::class) ->disableOriginalConstructor() ->getMock(); $buildLogger = $this - ->getMockBuilder('PHPCensor\Logging\BuildLogger') + ->getMockBuilder(BuildLogger::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php index 3c86b370e..5eeb8283a 100644 --- a/tests/src/Plugin/EmailTest.php +++ b/tests/src/Plugin/EmailTest.php @@ -5,6 +5,7 @@ namespace Tests\PHPCensor\Plugin; use PHPCensor\Builder; +use PHPCensor\DatabaseManager; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Model\Project; @@ -40,16 +41,16 @@ protected function setUp(): void $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); $this->project = $this - ->getMockBuilder('\PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->onlyMethods(['getTitle']) ->setMockClassName('mockProject') ->disableOriginalConstructor() @@ -60,7 +61,7 @@ protected function setUp(): void ->will($this->returnValue("Test-Project")); $this->build = $this - ->getMockBuilder('\PHPCensor\Model\Build') + ->getMockBuilder(Build::class) ->onlyMethods(['getLog', 'getStatus', 'getProject', 'getCommitterEmail']) ->setMockClassName('mockBuild') ->disableOriginalConstructor() @@ -85,7 +86,7 @@ protected function setUp(): void ->will($this->returnValue('committer-email@example.com')); $this->builder = $this - ->getMockBuilder('\PHPCensor\Builder') + ->getMockBuilder(Builder::class) ->onlyMethods(['log', 'logDebug', 'interpolate']) ->setMockClassName('mockBuilder_email') ->disableOriginalConstructor() @@ -133,7 +134,7 @@ protected function loadEmailPluginWithOptions(array $arrOptions = [], ?int $buil $self = $this; $this->testedEmailPlugin = $this - ->getMockBuilder('\PHPCensor\Plugin\EmailNotify') + ->getMockBuilder(Plugin\EmailNotify::class) ->onlyMethods(['sendEmail']) ->setConstructorArgs([$this->builder, $this->build, $arrOptions]) ->getMock(); diff --git a/tests/src/Plugin/PharTest.php b/tests/src/Plugin/PharTest.php index dab2e52da..36216e36d 100644 --- a/tests/src/Plugin/PharTest.php +++ b/tests/src/Plugin/PharTest.php @@ -5,6 +5,8 @@ namespace Tests\PHPCensor\Plugin; use Phar as PHPPhar; +use PHPCensor\Builder; +use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Plugin\Phar as PharPlugin; use PHPUnit\Framework\TestCase; @@ -21,12 +23,12 @@ protected function tearDown(): void protected function getPlugin(array $options = []): Plugin { $build = $this - ->getMockBuilder('PHPCensor\Model\Build') + ->getMockBuilder(Build::class) ->disableOriginalConstructor() ->getMock(); $builder = $this - ->getMockBuilder('PHPCensor\Builder') + ->getMockBuilder(Builder::class) ->disableOriginalConstructor() ->getMock(); @@ -105,9 +107,9 @@ protected function checkReadonly(): void public function testPlugin(): void { $plugin = $this->getPlugin(); - self::assertInstanceOf('PHPCensor\Plugin', $plugin); - self::assertInstanceOf('PHPCensor\Model\Build', $plugin->getBuild()); - self::assertInstanceOf('PHPCensor\Builder', $plugin->getBuilder()); + self::assertInstanceOf(Plugin::class, $plugin); + self::assertInstanceOf(Build::class, $plugin->getBuild()); + self::assertInstanceOf(Builder::class, $plugin->getBuilder()); } public function testFilename(): void diff --git a/tests/src/Plugin/Util/ExecutorTest.php b/tests/src/Plugin/Util/ExecutorTest.php index 8ce4b84eb..bf35333bc 100644 --- a/tests/src/Plugin/Util/ExecutorTest.php +++ b/tests/src/Plugin/Util/ExecutorTest.php @@ -5,8 +5,13 @@ namespace Tests\PHPCensor\Plugin\Util; use PHPCensor\Common\Exception\RuntimeException; +use PHPCensor\DatabaseManager; +use PHPCensor\Logging\BuildLogger; use PHPCensor\Model\Build; +use PHPCensor\Plugin; use PHPCensor\Plugin\Util\Executor; +use PHPCensor\Plugin\Util\Factory; +use PHPCensor\Store\BuildStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\Argument; @@ -29,17 +34,17 @@ protected function setUp(): void $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); - $this->buildLogger = $this->prophesize('\PHPCensor\Logging\BuildLogger'); - $this->factory = $this->prophesize('\PHPCensor\Plugin\Util\Factory'); - $this->buildStore = $this->prophesize('\PHPCensor\Store\BuildStore'); + $this->buildLogger = $this->prophesize(BuildLogger::class); + $this->factory = $this->prophesize(Factory::class); + $this->buildStore = $this->prophesize(BuildStore::class); $this->testedExecutor = new Executor( $this->storeRegistry, $this->factory->reveal(), @@ -59,12 +64,12 @@ public function testExecutePlugin_AssumesNamespaceIfNoneGiven(): void { $options = []; $pluginName = 'PhpUnit'; - $pluginNamespace = 'PHPCensor\\Plugin\\'; + $pluginNamespace = 'PHPCensor\Plugin\\'; $this->factory ->buildPlugin($pluginNamespace . $pluginName, $options) ->shouldBeCalledTimes(1) - ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); + ->willReturn($this->prophesize(Plugin::class)->reveal()); $this->testedExecutor->executePlugin($pluginName, $options); } @@ -77,7 +82,7 @@ public function testExecutePlugin_KeepsCalledNameSpace(): void $this->factory ->buildPlugin($pluginClass, $options) ->shouldBeCalledTimes(1) - ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal()); + ->willReturn($this->prophesize(Plugin::class)->reveal()); $this->testedExecutor->executePlugin($pluginClass, $options); } @@ -88,7 +93,7 @@ public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin(): void $pluginName = 'PhpUnit'; $build = new Build($this->storeRegistry); - $plugin = $this->prophesize('PHPCensor\Plugin'); + $plugin = $this->prophesize(Plugin::class); $plugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $plugin->execute()->shouldBeCalledTimes(1); @@ -105,7 +110,7 @@ public function testExecutePlugin_ReturnsPluginSuccess(): void $expectedReturnValue = true; - $plugin = $this->prophesize('PHPCensor\Plugin'); + $plugin = $this->prophesize(Plugin::class); $plugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $plugin->execute()->willReturn($expectedReturnValue); @@ -133,7 +138,7 @@ public function testExecutePlugin_LogsFailureWhenExceptionsAreThrownByPlugin(): $expectedException = new RuntimeException("Generic Error"); - $plugin = $this->prophesize('PHPCensor\Plugin'); + $plugin = $this->prophesize(Plugin::class); $plugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $plugin->execute()->willThrow($expectedException); @@ -159,9 +164,9 @@ public function testExecutePlugins_CallsEachPluginForStage(): void ] ]; - $pluginNamespace = 'PHPCensor\\Plugin\\'; + $pluginNamespace = 'PHPCensor\Plugin\\'; - $phpUnitPlugin = $this->prophesize('PHPCensor\Plugin'); + $phpUnitPlugin = $this->prophesize(Plugin::class); $phpUnitPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $phpUnitPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true); @@ -170,7 +175,7 @@ public function testExecutePlugins_CallsEachPluginForStage(): void ->willReturn($phpUnitPlugin->reveal()); $this->factory->getBuild()->willReturn($build); - $behatPlugin = $this->prophesize('PHPCensor\Plugin'); + $behatPlugin = $this->prophesize(Plugin::class); $behatPlugin->setStoreRegistry($this->storeRegistry)->shouldBeCalledTimes(1); $behatPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true); diff --git a/tests/src/PluginTest.php b/tests/src/PluginTest.php index ac9d36695..0c928c382 100644 --- a/tests/src/PluginTest.php +++ b/tests/src/PluginTest.php @@ -5,15 +5,14 @@ namespace Tests\PHPCensor; use PHPCensor\Builder; +use PHPCensor\DatabaseManager; use PHPCensor\Helper\BuildInterpolator; use PHPCensor\Model\Build; use PHPCensor\Plugin; use PHPCensor\Store\BuildStore; use PHPCensor\Store\EnvironmentStore; -use PHPCensor\Store\ProjectStore; use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; -use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use PHPCensor\Common\Application\ConfigurationInterface; @@ -84,11 +83,11 @@ protected function setUp(): void $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); diff --git a/tests/src/Security/Authentication/ServiceTest.php b/tests/src/Security/Authentication/ServiceTest.php index 1fd8e776d..2e1ee5713 100644 --- a/tests/src/Security/Authentication/ServiceTest.php +++ b/tests/src/Security/Authentication/ServiceTest.php @@ -5,9 +5,13 @@ namespace Tests\PHPCensor\Security\Authentication; use PHPCensor\Common\Application\ConfigurationInterface; +use PHPCensor\DatabaseManager; use PHPCensor\Model\User; +use PHPCensor\Security\Authentication\LoginPasswordProviderInterface; use PHPCensor\Security\Authentication\Service; use PHPCensor\Security\Authentication\UserProvider\AbstractProvider; +use PHPCensor\Security\Authentication\UserProvider\Internal; +use PHPCensor\Security\Authentication\UserProviderInterface; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; @@ -25,11 +29,11 @@ protected function setUp(): void $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); } @@ -38,23 +42,23 @@ public function testBuildBuiltinProvider(): void { $provider = Service::buildProvider($this->storeRegistry, 'test', ['type' => 'internal']); - self::assertInstanceOf('\PHPCensor\Security\Authentication\UserProvider\Internal', $provider); + self::assertInstanceOf(Internal::class, $provider); } public function testBuildAnyProvider(): void { - $config = ['type' => '\Tests\PHPCensor\Security\Authentication\DummyProvider']; + $config = ['type' => DummyProvider::class]; $provider = Service::buildProvider($this->storeRegistry, 'test', $config); - self::assertInstanceOf('\Tests\PHPCensor\Security\Authentication\DummyProvider', $provider); + self::assertInstanceOf(DummyProvider::class, $provider); self::assertEquals('test', $provider->getKey()); self::assertEquals($config, $provider->getConfig()); } public function testGetProviders(): void { - $a = $this->prophesize('\PHPCensor\Security\Authentication\UserProviderInterface')->reveal(); - $b = $this->prophesize('\PHPCensor\Security\Authentication\UserProviderInterface')->reveal(); + $a = $this->prophesize(UserProviderInterface::class)->reveal(); + $b = $this->prophesize(UserProviderInterface::class)->reveal(); $providers = ['a' => $a, 'b' => $b]; $service = new Service($this->configuration, $this->storeRegistry, $providers); @@ -64,8 +68,8 @@ public function testGetProviders(): void public function testGetLoginPasswordProviders(): void { - $a = $this->prophesize('\PHPCensor\Security\Authentication\UserProviderInterface')->reveal(); - $b = $this->prophesize('\PHPCensor\Security\Authentication\LoginPasswordProviderInterface')->reveal(); + $a = $this->prophesize(UserProviderInterface::class)->reveal(); + $b = $this->prophesize(LoginPasswordProviderInterface::class)->reveal(); $providers = ['a' => $a, 'b' => $b]; $service = new Service($this->configuration, $this->storeRegistry, $providers); diff --git a/tests/src/Security/Authentication/UserProvider/InternalTest.php b/tests/src/Security/Authentication/UserProvider/InternalTest.php index 043e978c6..cb12979cb 100644 --- a/tests/src/Security/Authentication/UserProvider/InternalTest.php +++ b/tests/src/Security/Authentication/UserProvider/InternalTest.php @@ -4,6 +4,7 @@ namespace Tests\PHPCensor\Security\Authentication\UserProvider; +use PHPCensor\DatabaseManager; use PHPCensor\Model\User; use PHPCensor\Security\Authentication\UserProvider\Internal; use PHPCensor\StoreRegistry; @@ -19,11 +20,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); diff --git a/tests/src/Service/BuildServiceTest.php b/tests/src/Service/BuildServiceTest.php index f4144ad68..d08c820ea 100644 --- a/tests/src/Service/BuildServiceTest.php +++ b/tests/src/Service/BuildServiceTest.php @@ -10,9 +10,11 @@ use PHPCensor\Common\Application\ConfigurationInterface; use PHPCensor\DatabaseManager; use PHPCensor\Model\Build; +use PHPCensor\Model\Project; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; use PHPCensor\Store\EnvironmentStore; +use PHPCensor\Store\ProjectStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; @@ -35,15 +37,15 @@ protected function setUp(): void { $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); $this->buildStore = $this - ->getMockBuilder('PHPCensor\Store\BuildStore') + ->getMockBuilder(BuildStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->buildStore @@ -52,7 +54,7 @@ protected function setUp(): void ->will($this->returnArgument(0)); $this->environmentStore = $this - ->getMockBuilder('PHPCensor\Store\EnvironmentStore') + ->getMockBuilder(EnvironmentStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->environmentStore @@ -61,7 +63,7 @@ protected function setUp(): void ->will($this->returnValue(['items' => [], 'count' => 0])); $projectStore = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); @@ -82,7 +84,7 @@ protected function setUp(): void public function testExecute_CreateBasicBuild(): void { $project = $this - ->getMockBuilder('PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->setConstructorArgs([$this->storeRegistry]) ->onlyMethods(['getEnvironmentStore']) ->getMock(); @@ -114,7 +116,7 @@ public function testExecute_CreateBasicBuild(): void public function testExecute_CreateBuildWithOptions(): void { $project = $this - ->getMockBuilder('PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->setConstructorArgs([$this->storeRegistry]) ->onlyMethods(['getEnvironmentStore']) ->getMock(); @@ -145,7 +147,7 @@ public function testExecute_CreateBuildWithOptions(): void public function testExecute_CreateBuildWithExtra(): void { $project = $this - ->getMockBuilder('PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->setConstructorArgs([$this->storeRegistry]) ->onlyMethods(['getEnvironmentStore']) ->getMock(); @@ -215,7 +217,7 @@ public function testExecute_CreateDuplicateBuild(): void public function testExecute_DeleteBuild(): void { $store = $this - ->getMockBuilder('PHPCensor\Store\BuildStore') + ->getMockBuilder(BuildStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $store->expects($this->once()) @@ -223,7 +225,7 @@ public function testExecute_DeleteBuild(): void ->will($this->returnValue(true)); $projectStore = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); diff --git a/tests/src/Service/BuildStatusServiceTest.php b/tests/src/Service/BuildStatusServiceTest.php index d8e6f0c00..9037fdcf8 100644 --- a/tests/src/Service/BuildStatusServiceTest.php +++ b/tests/src/Service/BuildStatusServiceTest.php @@ -5,6 +5,7 @@ namespace Tests\PHPCensor\Service; use DateTime; +use PHPCensor\DatabaseManager; use PHPCensor\Model\Build; use PHPCensor\Model\Project; use PHPCensor\Service\BuildStatusService; @@ -29,11 +30,11 @@ protected function setUp(): void { $configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$databaseManager]) ->getMock(); @@ -118,7 +119,7 @@ protected function getBuild(int $configId, bool $setProject = true): ?Build protected function getProjectMock(?int $prevBuildId = null, bool $setProject = true): Project { $project = $this - ->getMockBuilder('PHPCensor\Model\Project') + ->getMockBuilder(Project::class) ->setConstructorArgs([$this->storeRegistry]) ->onlyMethods(['getLatestBuild']) ->getMock(); diff --git a/tests/src/Service/ProjectServiceTest.php b/tests/src/Service/ProjectServiceTest.php index 6a28bfd73..a5bfa16ad 100644 --- a/tests/src/Service/ProjectServiceTest.php +++ b/tests/src/Service/ProjectServiceTest.php @@ -29,16 +29,16 @@ protected function setUp(): void { $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); $this->projectStore = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); @@ -330,7 +330,7 @@ public function testExecuteEmptyPublicStatus(): void public function testExecuteDeleteProject(): void { $store = $this - ->getMockBuilder('PHPCensor\Store\ProjectStore') + ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $store->expects($this->once()) diff --git a/tests/src/Service/UserServiceTest.php b/tests/src/Service/UserServiceTest.php index 2cc69e8ec..cdaf84ce8 100644 --- a/tests/src/Service/UserServiceTest.php +++ b/tests/src/Service/UserServiceTest.php @@ -29,16 +29,16 @@ protected function setUp(): void { $this->configuration = $this->getMockBuilder(ConfigurationInterface::class)->getMock(); $this->databaseManager = $this - ->getMockBuilder('PHPCensor\DatabaseManager') + ->getMockBuilder(DatabaseManager::class) ->setConstructorArgs([$this->configuration]) ->getMock(); $this->storeRegistry = $this - ->getMockBuilder('PHPCensor\StoreRegistry') + ->getMockBuilder(StoreRegistry::class) ->setConstructorArgs([$this->databaseManager]) ->getMock(); $this->userStore = $this - ->getMockBuilder('PHPCensor\Store\UserStore') + ->getMockBuilder(UserStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $this->userStore @@ -124,7 +124,7 @@ public function testExecute_DoesNotChangePasswordIfEmpty(): void public function testExecuteDeleteUser(): void { $store = $this - ->getMockBuilder('PHPCensor\Store\UserStore') + ->getMockBuilder(UserStore::class) ->setConstructorArgs([$this->databaseManager, $this->storeRegistry]) ->getMock(); $store->expects($this->once()) From 616a4cd678304ca08cc4a767756edee5ab5deb05 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 19 Jun 2022 15:29:34 +0700 Subject: [PATCH 146/212] Small test fixes. --- tests/src/BuilderTest.php | 1 - tests/src/Command/CreateAdminCommandTest.php | 4 ++-- tests/src/Command/CreateBuildCommandTest.php | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tests/src/BuilderTest.php b/tests/src/BuilderTest.php index 813dea4b7..cbc683c94 100644 --- a/tests/src/BuilderTest.php +++ b/tests/src/BuilderTest.php @@ -14,7 +14,6 @@ use PHPCensor\Model\Build; use PHPCensor\Model\Project; use PHPCensor\Store\BuildErrorWriter; -use PHPCensor\Store\BuildStore; use PHPCensor\StoreRegistry; use PHPUnit\Framework\TestCase; use Psr\Log\LogLevel; diff --git a/tests/src/Command/CreateAdminCommandTest.php b/tests/src/Command/CreateAdminCommandTest.php index e17868023..c004db5b3 100644 --- a/tests/src/Command/CreateAdminCommandTest.php +++ b/tests/src/Command/CreateAdminCommandTest.php @@ -40,12 +40,12 @@ protected function setUp(): void $this->logger = $this->getMockBuilder(Logger::class) ->setConstructorArgs(['logger']) ->getMock(); - $userStoreMock = $this + $userStore = $this ->getMockBuilder(UserStore::class) ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); - $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $userStoreMock); + $this->command = new CreateAdminCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $userStore); $this->helper = $this ->getMockBuilder(QuestionHelper::class) diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index b60ceae6a..b4dac954c 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -42,33 +42,33 @@ protected function setUp(): void $this->logger = $this->getMockBuilder(Logger::class) ->setConstructorArgs(['logger']) ->getMock(); - $projectMock = $this + $project = $this ->getMockBuilder(Project::class) ->setConstructorArgs([$storeRegistry]) ->getMock(); - $projectStoreMock = $this + $projectStore = $this ->getMockBuilder(ProjectStore::class) ->setConstructorArgs([$this->databaseManager, $storeRegistry]) ->getMock(); - $projectStoreMock->method('getById') + $projectStore->method('getById') ->will($this->returnValueMap([ - [1, 'read', $projectMock], + [1, 'read', $project], [2, 'read', null], ])); - $buildServiceMock = $this->getMockBuilder(BuildService::class) + $buildService = $this->getMockBuilder(BuildService::class) ->disableOriginalConstructor() ->getMock(); - $buildServiceMock->method('createBuild') + $buildService->method('createBuild') ->withConsecutive( - [$projectMock, null, null, null, null, null], - [$projectMock, '92c8c6e', null, null, null, null], - [$projectMock, null, 'master', null, null, null] + [$project, null, null, null, null, null], + [$project, '92c8c6e', null, null, null, null], + [$project, null, 'master', null, null, null] ); - $this->command = new CreateBuildCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $projectStoreMock, $buildServiceMock); + $this->command = new CreateBuildCommand($this->configuration, $this->databaseManager, $storeRegistry, $this->logger, $projectStore, $buildService); $this->application = new Application(); } From df1f89297a83baa4424b22b2ef6a12cabdc0b5fb Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 21 Jun 2022 11:24:10 +0700 Subject: [PATCH 147/212] Added ability to clone projects. --- src/Controller/ProjectController.php | 27 +++++++++++++++++++++++++++ src/Languages/lang.en.php | 1 + src/Languages/lang.ru.php | 1 + src/Model.php | 2 +- src/View/Project/view.phtml | 3 +++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 7f103b967..620ea6974 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -273,12 +273,39 @@ public function delete($projectId) { $this->requireAdmin(); + /** @var Project $project */ $project = $this->projectStore->getById($projectId); $this->projectService->deleteProject($project); return new RedirectResponse(APP_URL); } + /** + * @param int $projectId + * + * @return RedirectResponse + * @throws PHPCensor\Exception\HttpException + * @throws PHPCensor\Exception\HttpException\ForbiddenException + */ + public function clone(int $projectId) + { + $this->requireAdmin(); + + /** @var PHPCensor\Model\User $user */ + $user = $this->getUser(); + + /** @var Project $project */ + $project = $this->projectStore->getById($projectId); + $project->setId(null); + $project->setTitle('CLONE OF: ' . $project->getTitle()); + $project->setCreateDate(new \DateTime()); + $project->setUserId($user->getId()); + + $project = $this->projectStore->save($project); + + return new RedirectResponse(APP_URL.'project/view/' . $project->getId()); + } + /** * @param int $projectId * diff --git a/src/Languages/lang.en.php b/src/Languages/lang.en.php index 62402f2cb..210fd8f3d 100644 --- a/src/Languages/lang.en.php +++ b/src/Languages/lang.en.php @@ -64,6 +64,7 @@ 'build_now' => 'Build now', 'build_now_debug' => 'Build now with debug', 'edit_project' => 'Edit Project', + 'clone_project' => 'Clone Project', 'delete_project' => 'Delete Project', 'delete_old_builds' => 'Delete old builds', 'delete_all_builds' => 'Delete all builds', diff --git a/src/Languages/lang.ru.php b/src/Languages/lang.ru.php index 8983458d9..d2e568219 100644 --- a/src/Languages/lang.ru.php +++ b/src/Languages/lang.ru.php @@ -62,6 +62,7 @@ 'build_now' => 'Собрать', 'build_now_debug' => 'Собрать в режиме отладки', 'edit_project' => 'Редактировать проект', + 'clone_project' => 'Клонировать проект', 'delete_project' => 'Удалить проект', 'delete_old_builds' => 'Удалить старые сборки', 'delete_all_builds' => 'Удалить все сборки', diff --git a/src/Model.php b/src/Model.php index 44058e230..61afbb94f 100644 --- a/src/Model.php +++ b/src/Model.php @@ -130,7 +130,7 @@ public function getId(): ?int return $this->getDataItem('id'); } - public function setId(int $value): bool + public function setId(?int $value): bool { return $this->setDataItem('id', $value); } diff --git a/src/View/Project/view.phtml b/src/View/Project/view.phtml index 469620397..7e6c6679f 100644 --- a/src/View/Project/view.phtml +++ b/src/View/Project/view.phtml @@ -23,6 +23,9 @@ use PHPCensor\Model\User; + + + getIsAdmin()): ?> From de9658ee26183ad69f4af91b6dab249b1dfef739 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 22 Jun 2022 10:54:37 +0700 Subject: [PATCH 148/212] Code style fix. --- src/Controller/ProjectController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 620ea6974..ccf00ad7d 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -281,9 +281,8 @@ public function delete($projectId) } /** - * @param int $projectId - * * @return RedirectResponse + * * @throws PHPCensor\Exception\HttpException * @throws PHPCensor\Exception\HttpException\ForbiddenException */ From 3b4f7558f9181cd24edfebc501252c20e9827294 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 22 Jun 2022 10:58:34 +0700 Subject: [PATCH 149/212] Updated dependencies. Fixed: - guzzlehttp/guzzle (6.5.7) | CVE-2022-31090: CURLOPT_HTTPAUTH option not cleared on change of origin | https://github.com/guzzle/guzzle/security/advisories/GHSA-25mq-v84q-4j7r. - guzzlehttp/guzzle (6.5.7) | CVE-2022-31091: Change in port should be considered a change in origin | https://github.com/guzzle/guzzle/security/advisories/GHSA-q559-8m2m-g699. --- composer.lock | 81 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 05e053bfd..ba3944f71 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.4.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -65,7 +65,7 @@ }, { "name": "cakephp/database", - "version": "4.4.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", @@ -120,16 +120,16 @@ }, { "name": "cakephp/datasource", - "version": "4.4.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "be1f2177054df1904588fd4775f8954837529a9b" + "reference": "3a3e3fcd171f8b90fee8a614b53d913114e4fc09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/be1f2177054df1904588fd4775f8954837529a9b", - "reference": "be1f2177054df1904588fd4775f8954837529a9b", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/3a3e3fcd171f8b90fee8a614b53d913114e4fc09", + "reference": "3a3e3fcd171f8b90fee8a614b53d913114e4fc09", "shasum": "" }, "require": { @@ -174,11 +174,11 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-05-13T04:02:19+00:00" + "time": "2022-06-10T21:39:25+00:00" }, { "name": "cakephp/utility", - "version": "4.4.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", @@ -313,16 +313,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286" + "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a5ed8d58ed0c340a7c2109f587951b1c84cf6286", - "reference": "a5ed8d58ed0c340a7c2109f587951b1c84cf6286", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715", + "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715", "shasum": "" }, "require": { @@ -369,7 +369,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.1" }, "funding": [ { @@ -377,28 +377,28 @@ "type": "github" } ], - "time": "2022-05-28T22:19:18+00:00" + "time": "2022-06-18T20:57:19+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.7", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "724562fa861e21a4071c652c8a159934e4f05592" + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592", - "reference": "724562fa861e21a4071c652c8a159934e4f05592", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", + "guzzlehttp/psr7": "^1.9", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "symfony/polyfill-intl-idn": "^1.17" }, "require-dev": { "ext-curl": "*", @@ -476,7 +476,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.7" + "source": "https://github.com/guzzle/guzzle/tree/6.5.8" }, "funding": [ { @@ -492,7 +492,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:36:50+00:00" + "time": "2022-06-20T22:16:07+00:00" }, { "name": "guzzlehttp/promises", @@ -580,16 +580,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.5", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", "shasum": "" }, "require": { @@ -610,7 +610,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -670,7 +670,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.5" + "source": "https://github.com/guzzle/psr7/tree/1.9.0" }, "funding": [ { @@ -686,7 +686,7 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:51:18+00:00" + "time": "2022-06-20T21:43:03+00:00" }, { "name": "hipchat/hipchat-php", @@ -7093,16 +7093,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", "shasum": "" }, "require": { @@ -7136,7 +7136,6 @@ "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*", "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { @@ -7180,7 +7179,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" }, "funding": [ { @@ -7192,7 +7191,7 @@ "type": "github" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2022-06-19T12:14:25+00:00" }, { "name": "sanmai/later", @@ -8342,16 +8341,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.2", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", "shasum": "" }, "require": { @@ -8394,7 +8393,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-12-12T21:44:58+00:00" + "time": "2022-06-18T07:21:10+00:00" }, { "name": "symfony/options-resolver", From 9ff5fe2e773fe85e87cd10048d0ca7de3411549c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 26 Jun 2022 11:07:51 +0700 Subject: [PATCH 150/212] Updated current version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e571faf7..c8c13c76e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.9` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 44a8e0bcd971b83a6c2aee667ba6a7469bf3b16c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 6 Jul 2022 16:15:37 +0700 Subject: [PATCH 151/212] Added settings for DB tests. --- .php-censor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.php-censor.yml b/.php-censor.yml index effd305bd..88dac9397 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -6,6 +6,11 @@ build_settings: setup: composer: action: install + env: + POSTGRESQL_USER: '%SECRET:postgres_testdb_user%' + POSTGRESQL_PASSWORD: '%SECRET:postgres_testdb_password%' + MYSQL_USER: '%SECRET:mysql_testdb_user%' + MYSQL_PASSWORD: '%SECRET:mysql_testdb_password%' test: php_unit: From 932c443c7d1568b8092a25fb989479d5f23b0752 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 7 Jul 2022 11:46:14 +0700 Subject: [PATCH 152/212] Fixed settings for DB tests. --- .php-censor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.php-censor.yml b/.php-censor.yml index 88dac9397..2d93a74e4 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -9,8 +9,10 @@ setup: env: POSTGRESQL_USER: '%SECRET:postgres_testdb_user%' POSTGRESQL_PASSWORD: '%SECRET:postgres_testdb_password%' + POSTGRESQL_DBNAME: '%SECRET:postgres_testdb_name%' MYSQL_USER: '%SECRET:mysql_testdb_user%' MYSQL_PASSWORD: '%SECRET:mysql_testdb_password%' + MYSQL_DBNAME: '%SECRET:mysql_testdb_name%' test: php_unit: From 587968b2a47e7217c3af41bedd9c933ac02f502e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 10 Jul 2022 14:33:06 +0700 Subject: [PATCH 153/212] Fixed errors and coverage trends. --- src/Model/Build.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Model/Build.php b/src/Model/Build.php index da644b295..145ae8c52 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -624,14 +624,7 @@ public function getTotalErrorsCount($plugin = null, $severity = null, $isNew = n public function getErrorsTrend(): array { $total = (int)$this->getErrorsTotal(); - $previous = $this->getErrorsTotalPrevious(); - - if (null === $previous) { - return [ - 'trend' => -1, - 'delta' => $total, - ]; - } + $previous = (int)$this->getErrorsTotalPrevious(); if ($previous > $total) { return [ @@ -660,11 +653,12 @@ public function getTestCoverageTrend(): array $total = $this->getTestCoverage(); $previous = $this->getTestCoveragePrevious(); + if (null === $total) { + $total = '0.00'; + } + if (null === $previous) { - return [ - 'trend' => -1, - 'delta' => $total, - ]; + $previous = '0.00'; } return [ From 3ac08274ec9e594e4df1d1e95db2c77690ad7f10 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 17 Jul 2022 00:12:47 +0700 Subject: [PATCH 154/212] Small UI fix. --- src/View/Build/view.phtml | 2 +- src/View/Project/ajax-builds.phtml | 7 ++++++- src/View/WidgetLastBuilds/update.phtml | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/View/Build/view.phtml b/src/View/Build/view.phtml index 0b6974ef6..670314d78 100644 --- a/src/View/Build/view.phtml +++ b/src/View/Build/view.phtml @@ -187,7 +187,7 @@ use PHPCensor\Model\Environment; - + diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml index 16f875354..02900fdce 100644 --- a/src/View/Project/ajax-builds.phtml +++ b/src/View/Project/ajax-builds.phtml @@ -122,7 +122,12 @@ $branches = $build->getExtra('branches'); getStatus(), [Build::STATUS_PENDING, Build::STATUS_RUNNING], true)): ?> - getErrorsNew(); ?> + getErrorsNew(); ?> + + + + + diff --git a/src/View/WidgetLastBuilds/update.phtml b/src/View/WidgetLastBuilds/update.phtml index f996487cb..bf6f34792 100644 --- a/src/View/WidgetLastBuilds/update.phtml +++ b/src/View/WidgetLastBuilds/update.phtml @@ -146,10 +146,14 @@ use PHPCensor\Store\EnvironmentStore; - getErrorsNew()): ?> + getErrorsNew()): ?> / : - + + + + + | From fbbc1b56522d66491dcb68f6551f836b8fb4cc9c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 13 Aug 2022 21:53:24 +0700 Subject: [PATCH 155/212] Fixed docs style. --- bin/console | 0 docs/en/plugins/bitbucket_notify.md | 2 +- docs/en/plugins/clean_build.md | 2 +- docs/en/plugins/flowdock_notify.md | 4 ++-- docs/en/plugins/gulp.md | 2 +- docs/en/plugins/hipchat_notify.md | 4 ++-- docs/en/plugins/slack_notify.md | 4 ++-- docs/en/plugins/webhook_notify.md | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) mode change 100644 => 100755 bin/console diff --git a/bin/console b/bin/console old mode 100644 new mode 100755 diff --git a/docs/en/plugins/bitbucket_notify.md b/docs/en/plugins/bitbucket_notify.md index 40a0d4180..75ac67ba8 100644 --- a/docs/en/plugins/bitbucket_notify.md +++ b/docs/en/plugins/bitbucket_notify.md @@ -1,5 +1,5 @@ Plugin Bitbucket Notify -========================= +======================= This plugin notify you in Bitbucket about the build status with comments, tasks and build info. diff --git a/docs/en/plugins/clean_build.md b/docs/en/plugins/clean_build.md index c2b4cf084..75604c731 100644 --- a/docs/en/plugins/clean_build.md +++ b/docs/en/plugins/clean_build.md @@ -1,4 +1,4 @@ -Plugin Clean build +Plugin Clean Build ================== Works through a list of files to remove from your build. Useful when used in combination with Copy Build or Package diff --git a/docs/en/plugins/flowdock_notify.md b/docs/en/plugins/flowdock_notify.md index 5ec6fd181..6f80ec69a 100644 --- a/docs/en/plugins/flowdock_notify.md +++ b/docs/en/plugins/flowdock_notify.md @@ -1,5 +1,5 @@ -Plugin FlowdockNotify -===================== +Plugin Flowdock Notify +====================== This plugin joins a [Flowdock](https://www.flowdock.com/) room and sends a user-defined message, for example a "Build Succeeded" message. diff --git a/docs/en/plugins/gulp.md b/docs/en/plugins/gulp.md index c975882b2..83ebcbcde 100644 --- a/docs/en/plugins/gulp.md +++ b/docs/en/plugins/gulp.md @@ -1,4 +1,4 @@ -Plugin gulp +Plugin Gulp =========== This plugin runs [gulpjs](https://gulpjs.com/) tasks. diff --git a/docs/en/plugins/hipchat_notify.md b/docs/en/plugins/hipchat_notify.md index 9bd43e59a..6dfa9a10f 100644 --- a/docs/en/plugins/hipchat_notify.md +++ b/docs/en/plugins/hipchat_notify.md @@ -1,5 +1,5 @@ -Plugin HipchatNotify -==================== +Plugin Hipchat Notify +===================== This plugin joins a [HipChat](https://www.hipchat.com/) room and sends a user-defined message, for example a "Build Succeeded" message. diff --git a/docs/en/plugins/slack_notify.md b/docs/en/plugins/slack_notify.md index b6dc96529..ac89825ea 100644 --- a/docs/en/plugins/slack_notify.md +++ b/docs/en/plugins/slack_notify.md @@ -1,5 +1,5 @@ -Plugin SlackNotify -================== +Plugin Slack Notify +=================== This plugin joins a [Slack](https://www.slack.com/) room and sends a user-defined message, for example a "Build Succeeded" message. diff --git a/docs/en/plugins/webhook_notify.md b/docs/en/plugins/webhook_notify.md index 0443d831b..b8d76ffc0 100644 --- a/docs/en/plugins/webhook_notify.md +++ b/docs/en/plugins/webhook_notify.md @@ -1,5 +1,5 @@ -Plugin WebhookNotify -================== +Plugin Webhook Notify +===================== This plugin sends a JSON web hook to a configured URL. From da7aee767ebb0f01a9a3a9c965643e101969f589 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 4 Jul 2022 23:23:18 +0700 Subject: [PATCH 156/212] Added Changelog 2.0. --- CHANGELOG.md => docs/CHANGELOG_2.0.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.md => docs/CHANGELOG_2.0.md (100%) diff --git a/CHANGELOG.md b/docs/CHANGELOG_2.0.md similarity index 100% rename from CHANGELOG.md rename to docs/CHANGELOG_2.0.md From 64c588d4468f8cb0c8ca842bc3051c4d3a89f796 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 4 Jul 2022 23:29:49 +0700 Subject: [PATCH 157/212] Added Changelog 2.1. --- CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..fec694455 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,54 @@ +Changelog 2.1 +============= + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to +[Semantic Versioning](http://semver.org/spec/v2.0.0.html). + + +## [2.1.0 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.0) (2022-xx-xx) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.1.0) + +### Added + +- Secrets storage with UI and secret variables in build interpolation (you can use it like `%SECRET:secret_name%`. See [documentation](https://github.com/php-censor/php-censor/blob/master/docs/en/interpolation.md)). Issue [#14](https://github.com/php-censor/php-censor/issues/#14). +- Optional logging into database webhook requests payloads (option `php-censor.webhook.log_requests`). Issue [#384](https://github.com/php-censor/php-censor/issues/#384). +- Steps inside stages (`test`, `deploy` etc.) which allow to have several same plugins into one stage. Issue [#91](https://github.com/php-censor/php-censor/issues/#91). Pull request [#417](https://github.com/php-censor/php-censor/pull/417). Thanks to [@KieranFYI](https://github.com/KieranFYI). Usage example: + ```yml + setup: # <--- stage + setup_env: # <--- step 1 + plugin: shell # <--- step 1 plugin name + commands: + - "php -r \"copy('.env.ci', '.env');\"" + - "php artisan key:generate" + - "chmod -R 777 storage bootstrap/cache" + migrate: # <--- step 2 + plugin: shell # <--- step 2 same plugin name + commands: + - "php artisan migrate" + ``` +- `GET`-parameter `environment` for Git webhook. Issue [#407](https://github.com/php-censor/php-censor/issues/#407). +- Cloning/coping projects ability. +- **[PHP Unit]** Coverage trand for builds in the timeline on dashboard. + +### Changed + +- Massive refactoring: added types, dependency injection, new tests, documentation, fixed code style etc. Issue [#413](https://github.com/php-censor/php-censor/issues/#413). Pull requests [#412](https://github.com/php-censor/php-censor/pull/412), [#424](https://github.com/php-censor/php-censor/pull/424) and [#425](https://github.com/php-censor/php-censor/pull/425). Thanks to [@KieranFYI](https://github.com/KieranFYI) and [@Ooypunk](https://github.com/Ooypunk). +- Integrated `symfony/http-foundation` library as a new HTTP part of project. +- Integrate some features from `php-censor/common` library. +- Improved UI: fixed colors and ratio for `Chart.js` charts, added ability to disable AJAX UI reloading (option `php-censor.realtime_ui`), improved error trends view. Pull request [#426](https://github.com/php-censor/php-censor/pull/426). Thanks to [@KieranFYI](https://github.com/KieranFYI). +- Improved Ukrainian localization. Pull request [#419](https://github.com/php-censor/php-censor/pull/419). Thanks to [@oshka](https://github.com/oshka). + +### Fixed + +- Install command return code. +- [PHPUnit] Xdebug settings for coverage option. Pull request [#427](https://github.com/php-censor/php-censor/pull/427). Thanks to [@KieranFYI](https://github.com/KieranFYI). + +## Other versions + +- [0.x Changelog](/docs/CHANGELOG_0.x.md) +- [1.0 Changelog](/docs/CHANGELOG_1.0.md) +- [1.1 Changelog](/docs/CHANGELOG_1.1.md) +- [1.2 Changelog](/docs/CHANGELOG_1.2.md) +- [1.3 Changelog](/docs/CHANGELOG_1.3.md) +- [2.0 Changelog](/docs/CHANGELOG_2.0.md) From 36e2c6f1fc4685274baa26d5e12c419c7b413787 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 18 Aug 2022 21:51:46 +0700 Subject: [PATCH 158/212] Added changelog for version 2.1.0 and upgrade VERSION.md for release 2.1.0. --- CHANGELOG.md | 2 +- VERSION.md | 2 +- composer.lock | 341 +++++++++++++++++++++++++------------------------- 3 files changed, 172 insertions(+), 173 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fec694455..0bb392453 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.1.0 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.0) (2022-xx-xx) +## [2.1.0 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.0) (2022-08-18) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.1.0) diff --git a/VERSION.md b/VERSION.md index ccd4e8c10..7ec1d6db4 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.0-alpha +2.1.0 diff --git a/composer.lock b/composer.lock index ba3944f71..c99c5d333 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.4.1", + "version": "4.4.4", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -65,16 +65,16 @@ }, { "name": "cakephp/database", - "version": "4.4.1", + "version": "4.4.4", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "9bb8b691f36729fd630118a1cc7b52f9ae13d126" + "reference": "25694dd69cbfa61a6b17674b76aa2accd1f779f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/9bb8b691f36729fd630118a1cc7b52f9ae13d126", - "reference": "9bb8b691f36729fd630118a1cc7b52f9ae13d126", + "url": "https://api.github.com/repos/cakephp/database/zipball/25694dd69cbfa61a6b17674b76aa2accd1f779f9", + "reference": "25694dd69cbfa61a6b17674b76aa2accd1f779f9", "shasum": "" }, "require": { @@ -116,20 +116,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2022-04-12T01:11:53+00:00" + "time": "2022-07-21T13:36:55+00:00" }, { "name": "cakephp/datasource", - "version": "4.4.1", + "version": "4.4.4", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "3a3e3fcd171f8b90fee8a614b53d913114e4fc09" + "reference": "f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/3a3e3fcd171f8b90fee8a614b53d913114e4fc09", - "reference": "3a3e3fcd171f8b90fee8a614b53d913114e4fc09", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c", + "reference": "f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c", "shasum": "" }, "require": { @@ -174,20 +174,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-06-10T21:39:25+00:00" + "time": "2022-07-28T08:59:25+00:00" }, { "name": "cakephp/utility", - "version": "4.4.1", + "version": "4.4.4", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "b2a47e038954432b2e09d3406559a75656ebe131" + "reference": "32866aac3d4fef7649fb524da6c59e14e7d18a0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/b2a47e038954432b2e09d3406559a75656ebe131", - "reference": "b2a47e038954432b2e09d3406559a75656ebe131", + "url": "https://api.github.com/repos/cakephp/utility/zipball/32866aac3d4fef7649fb524da6c59e14e7d18a0d", + "reference": "32866aac3d4fef7649fb524da6c59e14e7d18a0d", "shasum": "" }, "require": { @@ -233,7 +233,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-05-20T04:16:49+00:00" + "time": "2022-07-16T21:24:52+00:00" }, { "name": "doctrine/lexer", @@ -838,16 +838,16 @@ }, { "name": "monolog/monolog", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", "shasum": "" }, "require": { @@ -867,11 +867,10 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1", + "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", "swiftmailer/swiftmailer": "^5.3|^6.0", @@ -891,7 +890,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -926,7 +924,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.7.0" + "source": "https://github.com/Seldaek/monolog/tree/2.8.0" }, "funding": [ { @@ -938,7 +936,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:59:12+00:00" + "time": "2022-07-24T11:55:47+00:00" }, { "name": "pda/pheanstalk", @@ -1529,16 +1527,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.10", + "version": "0.12.12", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "ad056cff354fc67fedf9bf96c441c2b428afad0c" + "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/ad056cff354fc67fedf9bf96c441c2b428afad0c", - "reference": "ad056cff354fc67fedf9bf96c441c2b428afad0c", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", + "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", "shasum": "" }, "require": { @@ -1609,9 +1607,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.10" + "source": "https://github.com/cakephp/phinx/tree/0.12.12" }, - "time": "2022-01-21T19:53:14+00:00" + "time": "2022-07-09T18:53:51+00:00" }, { "name": "sebastian/diff", @@ -1811,16 +1809,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.3", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "18e73179c6a33d520de1b644941eba108dd811ad" + "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/18e73179c6a33d520de1b644941eba108dd811ad", - "reference": "18e73179c6a33d520de1b644941eba108dd811ad", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027", + "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027", "shasum": "" }, "require": { @@ -1863,7 +1861,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.3" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.11" }, "funding": [ { @@ -1879,20 +1877,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-07-27T15:50:05+00:00" }, { "name": "symfony/cache", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a50b7249bea81ddd6d3b799ce40c5521c2f72f0b" + "reference": "5a0fff46df349f0db3fe242263451fddf5277362" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a50b7249bea81ddd6d3b799ce40c5521c2f72f0b", - "reference": "a50b7249bea81ddd6d3b799ce40c5521c2f72f0b", + "url": "https://api.github.com/repos/symfony/cache/zipball/5a0fff46df349f0db3fe242263451fddf5277362", + "reference": "5a0fff46df349f0db3fe242263451fddf5277362", "shasum": "" }, "require": { @@ -1960,7 +1958,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.9" + "source": "https://github.com/symfony/cache/tree/v5.4.11" }, "funding": [ { @@ -1976,11 +1974,11 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-07-28T15:25:17+00:00" }, { "name": "symfony/cache-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", @@ -2039,7 +2037,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" }, "funding": [ { @@ -2059,16 +2057,16 @@ }, { "name": "symfony/config", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "8f551fe22672ac7ab2c95fe46d899f960ed4d979" + "reference": "ec79e03125c1d2477e43dde8528535d90cc78379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/8f551fe22672ac7ab2c95fe46d899f960ed4d979", - "reference": "8f551fe22672ac7ab2c95fe46d899f960ed4d979", + "url": "https://api.github.com/repos/symfony/config/zipball/ec79e03125c1d2477e43dde8528535d90cc78379", + "reference": "ec79e03125c1d2477e43dde8528535d90cc78379", "shasum": "" }, "require": { @@ -2118,7 +2116,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.9" + "source": "https://github.com/symfony/config/tree/v5.4.11" }, "funding": [ { @@ -2134,20 +2132,20 @@ "type": "tidelift" } ], - "time": "2022-05-17T10:39:36+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/console", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" + "reference": "535846c7ee6bc4dd027ca0d93220601456734b10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", + "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10", + "reference": "535846c7ee6bc4dd027ca0d93220601456734b10", "shasum": "" }, "require": { @@ -2217,7 +2215,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.9" + "source": "https://github.com/symfony/console/tree/v5.4.11" }, "funding": [ { @@ -2233,20 +2231,20 @@ "type": "tidelift" } ], - "time": "2022-05-18T06:17:34+00:00" + "time": "2022-07-22T10:42:43+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.3", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e" + "reference": "c1681789f059ab756001052164726ae88512ae3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d", + "reference": "c1681789f059ab756001052164726ae88512ae3d", "shasum": "" }, "require": { @@ -2283,7 +2281,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.3" + "source": "https://github.com/symfony/css-selector/tree/v5.4.11" }, "funding": [ { @@ -2299,20 +2297,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "beecae161577305926ec078c4ed973f2b98880b3" + "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/beecae161577305926ec078c4ed973f2b98880b3", - "reference": "beecae161577305926ec078c4ed973f2b98880b3", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a8b9251016e9476db73e25fa836904bc0bf74c62", + "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62", "shasum": "" }, "require": { @@ -2372,7 +2370,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.9" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.11" }, "funding": [ { @@ -2388,11 +2386,11 @@ "type": "tidelift" } ], - "time": "2022-05-27T06:40:03+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -2439,7 +2437,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -2459,16 +2457,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "a213cbc80382320b0efdccdcdce232f191fafe3a" + "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a213cbc80382320b0efdccdcdce232f191fafe3a", - "reference": "a213cbc80382320b0efdccdcdce232f191fafe3a", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0b900ca5576ecd59e08c76127e616667cfe427a7", + "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7", "shasum": "" }, "require": { @@ -2514,7 +2512,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.9" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.11" }, "funding": [ { @@ -2530,7 +2528,7 @@ "type": "tidelift" } ], - "time": "2022-05-04T14:46:32+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/event-dispatcher", @@ -2619,7 +2617,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -2678,7 +2676,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" }, "funding": [ { @@ -2698,16 +2696,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" + "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd", + "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd", "shasum": "" }, "require": { @@ -2742,7 +2740,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.9" + "source": "https://github.com/symfony/filesystem/tree/v5.4.11" }, "funding": [ { @@ -2758,20 +2756,20 @@ "type": "tidelift" } ], - "time": "2022-05-20T13:55:35+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c", + "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c", "shasum": "" }, "require": { @@ -2805,7 +2803,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" + "source": "https://github.com/symfony/finder/tree/v5.4.11" }, "funding": [ { @@ -2821,20 +2819,20 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:07:45+00:00" + "time": "2022-07-29T07:37:50+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522" + "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0a5868e0999e9d47859ba3d918548ff6943e6389", + "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389", "shasum": "" }, "require": { @@ -2878,7 +2876,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.9" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.11" }, "funding": [ { @@ -2894,20 +2892,20 @@ "type": "tidelift" } ], - "time": "2022-05-17T15:07:29+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.8", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "c6e7aa958cb2884d68562264f421ffea59cdad41" + "reference": "9f34f71ec05cef8a0d434988476ee9fd32075a6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/c6e7aa958cb2884d68562264f421ffea59cdad41", - "reference": "c6e7aa958cb2884d68562264f421ffea59cdad41", + "url": "https://api.github.com/repos/symfony/mailer/zipball/9f34f71ec05cef8a0d434988476ee9fd32075a6c", + "reference": "9f34f71ec05cef8a0d434988476ee9fd32075a6c", "shasum": "" }, "require": { @@ -2954,7 +2952,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.8" + "source": "https://github.com/symfony/mailer/tree/v5.4.11" }, "funding": [ { @@ -2970,20 +2968,20 @@ "type": "tidelift" } ], - "time": "2022-04-27T17:10:22+00:00" + "time": "2022-07-24T16:05:20+00:00" }, { "name": "symfony/mime", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e" + "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e", + "url": "https://api.github.com/repos/symfony/mime/zipball/3cd175cdcdb6db2e589e837dd46aff41027d9830", + "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830", "shasum": "" }, "require": { @@ -3037,7 +3035,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.9" + "source": "https://github.com/symfony/mime/tree/v5.4.11" }, "funding": [ { @@ -3053,7 +3051,7 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-07-20T11:34:24+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3874,16 +3872,16 @@ }, { "name": "symfony/process", - "version": "v5.4.8", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" + "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1", + "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1", "shasum": "" }, "require": { @@ -3916,7 +3914,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.8" + "source": "https://github.com/symfony/process/tree/v5.4.11" }, "funding": [ { @@ -3932,20 +3930,20 @@ "type": "tidelift" } ], - "time": "2022-04-08T05:07:18+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -3999,7 +3997,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -4015,20 +4013,20 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" + "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322", + "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322", "shasum": "" }, "require": { @@ -4085,7 +4083,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.9" + "source": "https://github.com/symfony/string/tree/v5.4.11" }, "funding": [ { @@ -4101,20 +4099,20 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2022-07-24T16:15:25+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "63249ebfca4e75a357679fa7ba2089cfb898aa67" + "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/63249ebfca4e75a357679fa7ba2089cfb898aa67", - "reference": "63249ebfca4e75a357679fa7ba2089cfb898aa67", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/8fc03ee75eeece3d9be1ef47d26d79bea1afb340", + "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340", "shasum": "" }, "require": { @@ -4158,7 +4156,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.9" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.10" }, "funding": [ { @@ -4174,20 +4172,20 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-05-27T12:56:18+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.3", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e80f87d2c9495966768310fc531b487ce64237a2" + "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e80f87d2c9495966768310fc531b487ce64237a2", - "reference": "e80f87d2c9495966768310fc531b487ce64237a2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/05d4ea560f3402c6c116afd99fdc66e60eda227e", + "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e", "shasum": "" }, "require": { @@ -4233,7 +4231,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.3" + "source": "https://github.com/symfony/yaml/tree/v5.4.11" }, "funding": [ { @@ -4249,7 +4247,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T16:32:32+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "voku/anti-xss", @@ -4410,16 +4408,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.4", + "version": "6.0.5", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8" + "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/f6c78e492520115bb2d947c3a0d90a2c6b7a60a8", - "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/6c764c2c4fcad451a0f6622260a4934cfea08aa4", + "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4", "shasum": "" }, "require": { @@ -4481,7 +4479,7 @@ ], "support": { "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.4" + "source": "https://github.com/voku/portable-utf8/tree/6.0.5" }, "funding": [ { @@ -4505,7 +4503,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:04:59+00:00" + "time": "2022-08-10T12:32:31+00:00" } ], "packages-dev": [ @@ -5005,16 +5003,16 @@ }, { "name": "doctrine/annotations", - "version": "1.13.2", + "version": "1.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "reference": "648b0343343565c4a056bfc8392201385e8d89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", + "reference": "648b0343343565c4a056bfc8392201385e8d89f0", "shasum": "" }, "require": { @@ -5026,9 +5024,10 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": "^1.4.10 || ^1.8.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "symfony/cache": "^4.4 || ^5.2", + "vimeo/psalm": "^4.10" }, "type": "library", "autoload": { @@ -5071,9 +5070,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "source": "https://github.com/doctrine/annotations/tree/1.13.3" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2022-07-02T10:48:51+00:00" }, { "name": "doctrine/instantiator", @@ -8397,16 +8396,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.3", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" + "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690", + "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690", "shasum": "" }, "require": { @@ -8446,7 +8445,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.11" }, "funding": [ { @@ -8462,7 +8461,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-07-20T13:00:38+00:00" }, { "name": "symfony/stopwatch", @@ -8528,16 +8527,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.42", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca" + "reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/742aab50ad097bcb62d91fccb613f66b8047d2ca", - "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f19951007dae942cc79b979c1fe26bfdfbeb54ed", + "reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed", "shasum": "" }, "require": { @@ -8597,7 +8596,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.42" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.44" }, "funding": [ { @@ -8613,7 +8612,7 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:00:54+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "thecodingmachine/safe", @@ -8806,16 +8805,16 @@ }, { "name": "vimeo/psalm", - "version": "4.23.0", + "version": "4.26.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88" + "reference": "6998fabb2bf528b65777bf9941920888d23c03ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1fe6ff483bf325c803df9f510d09a03fd796f88", - "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac", + "reference": "6998fabb2bf528b65777bf9941920888d23c03ac", "shasum": "" }, "require": { @@ -8907,9 +8906,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.23.0" + "source": "https://github.com/vimeo/psalm/tree/4.26.0" }, - "time": "2022-04-28T17:35:49+00:00" + "time": "2022-07-31T13:10:26+00:00" }, { "name": "webmozart/assert", From 1f2a520c2bdfa0ae8c363b3a39786ad2214b2baf Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 18 Aug 2022 22:07:13 +0700 Subject: [PATCH 159/212] Fixes after release 2.1. --- CHANGELOG.md | 2 +- VERSION.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb392453..ee9f4c661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed - Install command return code. -- [PHPUnit] Xdebug settings for coverage option. Pull request [#427](https://github.com/php-censor/php-censor/pull/427). Thanks to [@KieranFYI](https://github.com/KieranFYI). +- **[PHPUnit]** Xdebug settings for coverage option. Pull request [#427](https://github.com/php-censor/php-censor/pull/427). Thanks to [@KieranFYI](https://github.com/KieranFYI). ## Other versions diff --git a/VERSION.md b/VERSION.md index 7ec1d6db4..a74d18b8d 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.0 +2.2.0-alpha From f124daf726bfb4a0a311e81731f51ea371397bd2 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 18 Aug 2022 22:27:06 +0700 Subject: [PATCH 160/212] Fixed README. --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c8c13c76e..31e859904 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,15 @@ PHP Censor versions: -| Version | Latest | Branch | Status | Minimal PHP Version | -| :------------------: |:--------:| :-----------: |:---------------------------------------------------------------------:| :-----------------: | -| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Current stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | +| Version | Latest | Branch | Status | Minimal PHP Version | +|:---------------------:|:--------:|:-------------:|:------------------------------------------------------------------:| :-----------------: | +| `1.0` (Morty Smith) | `1.0.16` | `release-1.0` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | +| `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.0` | `release-2.1` | Current stable version | `>=7.4` | +| `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 08e7f5b60c03a3449c3991691e114613aa01c02e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 28 Aug 2022 13:30:09 +0700 Subject: [PATCH 161/212] Fixed php-censor/common package version. --- bin/console | 4 +++- composer.json | 2 +- composer.lock | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/console b/bin/console index f97d3bb90..6e170bd6a 100755 --- a/bin/console +++ b/bin/console @@ -1,13 +1,15 @@ #!/usr/bin/env php Date: Sun, 28 Aug 2022 13:34:08 +0700 Subject: [PATCH 162/212] Fixed tests. --- src/ArrayConfiguration.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ArrayConfiguration.php b/src/ArrayConfiguration.php index fa445ab86..78b77d223 100644 --- a/src/ArrayConfiguration.php +++ b/src/ArrayConfiguration.php @@ -15,4 +15,8 @@ */ class ArrayConfiguration extends ParameterBag implements ConfigurationInterface { + public function load(): void + { + return; + } } From 4c322e3bc3bab6d7634faa9da73aad4b43c11b97 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 00:32:42 +0700 Subject: [PATCH 163/212] Fixed .gitattributes. --- .gitattributes | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index eebe80359..f2b996686 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,12 +7,14 @@ /tests/ export-ignore /docs/ export-ignore -/Makefile export-ignore -/.editorconfig export-ignore -/.gitattributes export-ignore -/.gitignore export-ignore -/.php-censor.yml export-ignore -/phpunit.xml.dist export-ignore -/phpmd.xml.dist export-ignore -/.php_cs.dist export-ignore -/codecov.yml export-ignore +/Makefile export-ignore +/.editorconfig export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.php-censor.yml export-ignore +/phpunit.xml.dist export-ignore +/phpmd.xml.dist export-ignore +/.php_cs.dist export-ignore +/codecov.yml export-ignore +/infection.json.dist export-ignore +/psalm.xml.dist export-ignore From 9064e3e83188c74b9a74d6dc827c9f705b8a7b3e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 00:39:56 +0700 Subject: [PATCH 164/212] Improved tests. --- .github/workflows/ci.yaml | 1 + .php-censor.yml | 1 + phpunit.xml.dist | 1 + tests/src/BaseMysqlTestCase.php | 14 +++++++++++--- tests/src/BasePostgresTestCase.php | 30 +++++++++++++++++++----------- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index becf4ac33..2fd3a293f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,6 +57,7 @@ jobs: - name: Run tests run: | + export SKIP_DB_TESTS=0; export POSTGRESQL_USER='postgres'; export POSTGRESQL_PASSWORD='postgres'; export MYSQL_USER='root'; diff --git a/.php-censor.yml b/.php-censor.yml index 2d93a74e4..5895258eb 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -7,6 +7,7 @@ setup: composer: action: install env: + SKIP_DB_TESTS: '0' POSTGRESQL_USER: '%SECRET:postgres_testdb_user%' POSTGRESQL_PASSWORD: '%SECRET:postgres_testdb_password%' POSTGRESQL_DBNAME: '%SECRET:postgres_testdb_name%' diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0ddb48471..7901184b7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,7 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" > + diff --git a/tests/src/BaseMysqlTestCase.php b/tests/src/BaseMysqlTestCase.php index 4e44e2402..d08dbc396 100644 --- a/tests/src/BaseMysqlTestCase.php +++ b/tests/src/BaseMysqlTestCase.php @@ -53,7 +53,9 @@ protected function migrateDatabaseScheme(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - //var_dump($e); + if (!\env('SKIP_DB_TESTS')) { + throw $e; + } } } @@ -144,7 +146,9 @@ protected function setUp(): void $this->migrateDatabaseScheme(); $this->migrateDatabaseData(); } catch (\Throwable $e) { - //var_dump($e); + if (!\env('SKIP_DB_TESTS')) { + throw $e; + } $this->connection = null; } @@ -170,7 +174,11 @@ protected function tearDown(): void protected function getConnection(): ?\PDO { if (null === $this->connection) { - $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); + if (\env('SKIP_DB_TESTS')) { + $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); + } else { + $this->fail('Test failed because MySQL database/user/extension doesn\'t exist.'); + } } return $this->connection; diff --git a/tests/src/BasePostgresTestCase.php b/tests/src/BasePostgresTestCase.php index e769ffcfc..6346ae00a 100644 --- a/tests/src/BasePostgresTestCase.php +++ b/tests/src/BasePostgresTestCase.php @@ -35,9 +35,9 @@ protected function generatePhinxConfig(): PhinxConfig 'php-censor' => [ 'adapter' => 'pgsql', 'host' => '127.0.0.1', - 'name' => env('POSTGRESQL_DBNAME'), - 'user' => env('POSTGRESQL_USER'), - 'pass' => env('POSTGRESQL_PASSWORD'), + 'name' => \env('POSTGRESQL_DBNAME'), + 'user' => \env('POSTGRESQL_USER'), + 'pass' => \env('POSTGRESQL_PASSWORD'), ], ], ]; @@ -53,7 +53,9 @@ protected function migrateDatabaseScheme(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - //var_dump($e); + if (!\env('SKIP_DB_TESTS')) { + throw $e; + } } } @@ -119,9 +121,9 @@ protected function generateAppConfiguration(): ConfigurationInterface ], ], 'type' => 'pgsql', - 'name' => env('POSTGRESQL_DBNAME'), - 'username' => env('POSTGRESQL_USER'), - 'password' => env('POSTGRESQL_PASSWORD'), + 'name' => \env('POSTGRESQL_DBNAME'), + 'username' => \env('POSTGRESQL_USER'), + 'password' => \env('POSTGRESQL_PASSWORD'), ], ], ]; @@ -136,15 +138,17 @@ protected function setUp(): void try { $this->connection = new \PDO( 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), - env('POSTGRESQL_USER'), - env('POSTGRESQL_PASSWORD') + \env('POSTGRESQL_USER'), + \env('POSTGRESQL_PASSWORD') ); $this->dropTables(); $this->migrateDatabaseScheme(); $this->migrateDatabaseData(); } catch (\Throwable $e) { - //var_dump($e); + if (!\env('SKIP_DB_TESTS')) { + throw $e; + } $this->connection = null; } @@ -170,7 +174,11 @@ protected function tearDown(): void protected function getConnection(): ?\PDO { if (null === $this->connection) { - $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + if (\env('SKIP_DB_TESTS')) { + $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); + } else { + $this->fail('Test failed because PostgreSQL database/user/extension doesn\'t exist.'); + } } return $this->connection; From a714c21ded16ddad6a8b69509eb1124e1e9c1a38 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 00:49:18 +0700 Subject: [PATCH 165/212] Fixes. --- .../Model/Build/GitGetDiffLineNumberTrait.php | 4 ++-- tests/src/BaseMysqlTestCase.php | 6 ++--- tests/src/BasePostgresTestCase.php | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php index e29d0bf7f..8dfde96fb 100644 --- a/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php +++ b/src/Traits/Model/Build/GitGetDiffLineNumberTrait.php @@ -22,7 +22,7 @@ trait GitGetDiffLineNumberTrait /** * Uses git diff to figure out what the diff line position is, based on the error line number. */ - protected function getDiffLineNumber(Builder $builder, string $file, int $line): ?int + protected function getDiffLineNumber(Builder $builder, string $file, ?int $line): ?int { $builder->logExecOutput(false); @@ -44,7 +44,7 @@ protected function getDiffLineNumber(Builder $builder, string $file, int $line): $lines = $this->getLinePositions($diff); - return $lines[$line] ?? null; + return $lines[(int)$line] ?? null; } /** diff --git a/tests/src/BaseMysqlTestCase.php b/tests/src/BaseMysqlTestCase.php index d08dbc396..e7e49136c 100644 --- a/tests/src/BaseMysqlTestCase.php +++ b/tests/src/BaseMysqlTestCase.php @@ -53,7 +53,7 @@ protected function migrateDatabaseScheme(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - if (!\env('SKIP_DB_TESTS')) { + if (!env('SKIP_DB_TESTS')) { throw $e; } } @@ -146,7 +146,7 @@ protected function setUp(): void $this->migrateDatabaseScheme(); $this->migrateDatabaseData(); } catch (\Throwable $e) { - if (!\env('SKIP_DB_TESTS')) { + if (!env('SKIP_DB_TESTS')) { throw $e; } @@ -174,7 +174,7 @@ protected function tearDown(): void protected function getConnection(): ?\PDO { if (null === $this->connection) { - if (\env('SKIP_DB_TESTS')) { + if (env('SKIP_DB_TESTS')) { $this->markTestSkipped('Test skipped because MySQL database/user/extension doesn\'t exist.'); } else { $this->fail('Test failed because MySQL database/user/extension doesn\'t exist.'); diff --git a/tests/src/BasePostgresTestCase.php b/tests/src/BasePostgresTestCase.php index 6346ae00a..a35469dd5 100644 --- a/tests/src/BasePostgresTestCase.php +++ b/tests/src/BasePostgresTestCase.php @@ -35,9 +35,9 @@ protected function generatePhinxConfig(): PhinxConfig 'php-censor' => [ 'adapter' => 'pgsql', 'host' => '127.0.0.1', - 'name' => \env('POSTGRESQL_DBNAME'), - 'user' => \env('POSTGRESQL_USER'), - 'pass' => \env('POSTGRESQL_PASSWORD'), + 'name' => env('POSTGRESQL_DBNAME'), + 'user' => env('POSTGRESQL_USER'), + 'pass' => env('POSTGRESQL_PASSWORD'), ], ], ]; @@ -53,7 +53,7 @@ protected function migrateDatabaseScheme(): void ->setName('php-censor-migrations:migrate') ->run(new ArgvInput([]), new ConsoleOutput(OutputInterface::VERBOSITY_QUIET)); } catch (\Throwable $e) { - if (!\env('SKIP_DB_TESTS')) { + if (!env('SKIP_DB_TESTS')) { throw $e; } } @@ -121,9 +121,9 @@ protected function generateAppConfiguration(): ConfigurationInterface ], ], 'type' => 'pgsql', - 'name' => \env('POSTGRESQL_DBNAME'), - 'username' => \env('POSTGRESQL_USER'), - 'password' => \env('POSTGRESQL_PASSWORD'), + 'name' => env('POSTGRESQL_DBNAME'), + 'username' => env('POSTGRESQL_USER'), + 'password' => env('POSTGRESQL_PASSWORD'), ], ], ]; @@ -138,15 +138,15 @@ protected function setUp(): void try { $this->connection = new \PDO( 'pgsql:host=127.0.0.1;dbname=' . env('POSTGRESQL_DBNAME'), - \env('POSTGRESQL_USER'), - \env('POSTGRESQL_PASSWORD') + env('POSTGRESQL_USER'), + env('POSTGRESQL_PASSWORD') ); $this->dropTables(); $this->migrateDatabaseScheme(); $this->migrateDatabaseData(); } catch (\Throwable $e) { - if (!\env('SKIP_DB_TESTS')) { + if (!env('SKIP_DB_TESTS')) { throw $e; } @@ -174,7 +174,7 @@ protected function tearDown(): void protected function getConnection(): ?\PDO { if (null === $this->connection) { - if (\env('SKIP_DB_TESTS')) { + if (env('SKIP_DB_TESTS')) { $this->markTestSkipped('Test skipped because PostgreSQL database/user/extension doesn\'t exist.'); } else { $this->fail('Test failed because PostgreSQL database/user/extension doesn\'t exist.'); From 58ef53d3e316c7189858ec10221935d149a46d2c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 12:21:20 +0700 Subject: [PATCH 166/212] Fixes for secrets: hide secrets in the log. --- src/Logging/BuildDBLogHandler.php | 54 +++++++++++++++++++++++++------ src/Store.php | 22 +++++++++++++ src/Store/ProjectStore.php | 2 +- src/WebController.php | 2 +- src/Worker/BuildWorker.php | 6 +++- 5 files changed, 74 insertions(+), 12 deletions(-) diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index b48f2c391..a0cfbd9a9 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -7,7 +7,9 @@ use Monolog\Handler\AbstractProcessingHandler; use Monolog\Logger; use PHPCensor\Model\Build; +use PHPCensor\Model\Secret; use PHPCensor\Store\BuildStore; +use PHPCensor\Store\SecretStore; /** * Class BuildDBLogHandler writes the build log to the database. @@ -20,8 +22,8 @@ class BuildDBLogHandler extends AbstractProcessingHandler { protected Build $build; - protected BuildStore $buildStore; + private SecretStore $secretStore; protected string $logValue; @@ -36,6 +38,7 @@ class BuildDBLogHandler extends AbstractProcessingHandler protected int $flushDelay = 1; public function __construct( + SecretStore $secretStore, BuildStore $buildStore, Build $build, int $level = Logger::INFO, @@ -43,8 +46,9 @@ public function __construct( ) { parent::__construct($level, $bubble); - $this->build = $build; - $this->buildStore = $buildStore; + $this->secretStore = $secretStore; + $this->build = $build; + $this->buildStore = $buildStore; // We want to add to any existing saved log information. $this->logValue = (string)$build->getLog(); @@ -66,17 +70,49 @@ protected function flushData(): void $this->flushTimestamp = \time(); } + private function sanitize(string $message): string + { + return \str_replace([ + '\/', + '//', + $this->build->getBuildPath(), + ROOT_DIR, + ], [ + '/', + '//', + '/', + '/', + ], $message); + } + + private function sanitizeSecrets(string $message): string + { + $replace = []; + $secrets = $this->secretStore->getAll(); + if (\count($secrets['items']) > 0) { + /** @var Secret $secret */ + foreach ($secrets['items'] as $secret) { + $value = $secret->getValue(); + $name = '%' . \sprintf('SECRET:%s', $secret->getName()) . '%'; + if (\trim($value)) { + $replace[$name] = $secret->getValue(); + } + } + } + + return \str_replace($replace, \array_keys($replace), $message); + } + /** * Write a log entry to the build log. */ protected function write(array $record): void { - $message = (string)$record['message']; - $message = \str_replace(['\/', '//'], '/', $message); - $message = \str_replace($this->build->getBuildPath(), '/', $message); - $message = \str_replace(ROOT_DIR, '/', $message); - - $this->logValue .= $message . PHP_EOL; + $this->logValue .= $this->sanitize( + $this->sanitizeSecrets( + (string)$record['message'] + ) + ) . PHP_EOL; if ($this->flushTimestamp < (\time() - $this->flushDelay)) { $this->flushData(); diff --git a/src/Store.php b/src/Store.php index fbbb44ae4..02949dabf 100644 --- a/src/Store.php +++ b/src/Store.php @@ -53,6 +53,28 @@ public function getById(int $id, string $useConnection = 'read'): ?Model return null; } + public function getAll(string $useConnection = 'read'): array + { + $query = 'SELECT * FROM {{' . $this->tableName . '}}'; + $countQuery = 'SELECT COUNT(*) AS {{count}} FROM {{' . $this->tableName . '}}'; + + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($countQuery); + $stmt->execute(); + $res = $stmt->fetch(PDO::FETCH_ASSOC); + $count = (int)$res['count']; + + $stmt = $this->databaseManager->getConnection($useConnection)->prepare($query); + $stmt->execute(); + $res = $stmt->fetchAll(PDO::FETCH_ASSOC); + $rtn = []; + + foreach ($res as $data) { + $rtn[] = new $this->modelName($this->storeRegistry, $data); + } + + return ['items' => $rtn, 'count' => $count]; + } + /** * @throws Common\Exception\Exception * @throws InvalidArgumentException diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index b56ed6614..84e199bfb 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -110,7 +110,7 @@ public function getKnownBranches(int $projectId): array /** * Get a list of all projects, ordered by their title. */ - public function getAll(bool $archived = false): array + public function getAll(string $useConnection = 'read', bool $archived = false): array { $archived = (int)$archived; diff --git a/src/WebController.php b/src/WebController.php index d2a89b640..42aa0d9ca 100644 --- a/src/WebController.php +++ b/src/WebController.php @@ -69,7 +69,7 @@ public function init(): void $groups[] = $thisGroup; } - $archivedProjects = $this->storeRegistry->get('Project')->getAll(true); + $archivedProjects = $this->storeRegistry->get('Project')->getAll('read', true); $this->layout->archivedProjects = $archivedProjects['items']; $this->layout->groups = $groups; $this->layout->user = $this->getUser(); diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index c998e66f6..21f22a0ef 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -18,6 +18,7 @@ use PHPCensor\Model\Build; use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; +use PHPCensor\Store\SecretStore; use PHPCensor\StoreRegistry; use Psr\Log\LoggerInterface; @@ -170,8 +171,11 @@ protected function runWorker(): void /** @var BuildStore $buildStore */ $buildStore = $this->storeRegistry->get('Build'); + /** @var SecretStore $secretStore */ + $secretStore = $this->storeRegistry->get('Secret'); + // Logging relevant to this build should be stored against the build itself. - $buildDbLog = new BuildDBLogHandler($buildStore, $build, Logger::DEBUG); + $buildDbLog = new BuildDBLogHandler($secretStore, $buildStore, $build, Logger::DEBUG); $this->logger->pushHandler($buildDbLog); $buildLogger = new BuildLogger($this->logger, $build); From ce20e6bd38c20c54e8e250f9b314660dc3393888 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 13:46:00 +0700 Subject: [PATCH 167/212] Fixes for secrets: improved secret name validation. --- src/Controller/SecretController.php | 2 +- src/Form/Input.php | 2 +- src/Helper/BuildInterpolator.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Controller/SecretController.php b/src/Controller/SecretController.php index 5dff20ecf..0f3b42d93 100644 --- a/src/Controller/SecretController.php +++ b/src/Controller/SecretController.php @@ -100,7 +100,7 @@ public function edit(?int $secretId = null) $field ->setClass('form-control') ->setContainerClass('form-group') - ->setPattern('^[^\s]+') + ->setPattern('^[-_\w\d]+$') ->setValue($secret->getName()); $form->addField($field); diff --git a/src/Form/Input.php b/src/Form/Input.php index 62ab3146a..1cd182217 100644 --- a/src/Form/Input.php +++ b/src/Form/Input.php @@ -129,7 +129,7 @@ public function validate(): bool return false; } - if ($this->getPattern() && !\preg_match('/' . $this->getPattern() . '/', (string)$this->getValue())) { + if ($this->getPattern() && !\preg_match('#' . $this->getPattern() . '#', (string)$this->getValue())) { $this->error = 'Invalid value entered.'; return false; diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index 07e889850..d2cf828d3 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -103,7 +103,7 @@ private function realtimeInterpolate(string $input): string private function secretInterpolate(string $input): string { - \preg_match_all('#%SECRET:(.+?)%#', $input, $matches); + \preg_match_all('#%SECRET:([-_\w\d]+)?%#', $input, $matches); if (!empty($matches[0])) { $secrets = $this->secretStore->getByNames($matches[1]); $finalSecrets = []; From e8eec25f5ed7fe2881f1d9490a7f32b3459ccf71 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 22:28:08 +0700 Subject: [PATCH 168/212] Added changelog for version 2.1.1 and upgrade VERSION.md for release 2.1.1. --- CHANGELOG.md | 11 +++ VERSION.md | 2 +- composer.lock | 212 +++++++++++++++++++++++++------------------------- 3 files changed, 118 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb392453..38221c9ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.1 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.1) (2022-08-30) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.0...2.1.1) + +### Fixed + +- `php-censor/common` package version. +- Logging with secret variables (Now secrets hides from log). +- Secrets validation. + + ## [2.1.0 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.0) (2022-08-18) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.1.0) diff --git a/VERSION.md b/VERSION.md index 7ec1d6db4..3e3c2f1e5 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.0 +2.1.1 diff --git a/composer.lock b/composer.lock index 9e884e2d2..3340b2cf8 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/core", - "version": "4.4.4", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "884555efcf573ea23597f9c88a12ed6d58af00f3" + "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/884555efcf573ea23597f9c88a12ed6d58af00f3", - "reference": "884555efcf573ea23597f9c88a12ed6d58af00f3", + "url": "https://api.github.com/repos/cakephp/core/zipball/77e53e3784863c1b8006464b82ab842ee7c58e6b", + "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b", "shasum": "" }, "require": { @@ -61,20 +61,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2022-05-31T20:57:08+00:00" + "time": "2022-08-26T02:01:18+00:00" }, { "name": "cakephp/database", - "version": "4.4.4", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "25694dd69cbfa61a6b17674b76aa2accd1f779f9" + "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/25694dd69cbfa61a6b17674b76aa2accd1f779f9", - "reference": "25694dd69cbfa61a6b17674b76aa2accd1f779f9", + "url": "https://api.github.com/repos/cakephp/database/zipball/eec6239b0734e2a4dfe212dc93bcd505c7d296ef", + "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef", "shasum": "" }, "require": { @@ -116,20 +116,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2022-07-21T13:36:55+00:00" + "time": "2022-08-18T21:01:25+00:00" }, { "name": "cakephp/datasource", - "version": "4.4.4", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c" + "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c", - "reference": "f0dd560edbaf6dac8045e7804c25d2e8e6ef0d3c", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/6fbd1f49833dedf3bd351e1a98b18133a6b9e86c", + "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c", "shasum": "" }, "require": { @@ -174,20 +174,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-07-28T08:59:25+00:00" + "time": "2022-08-18T20:55:21+00:00" }, { "name": "cakephp/utility", - "version": "4.4.4", + "version": "4.4.5", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "32866aac3d4fef7649fb524da6c59e14e7d18a0d" + "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/32866aac3d4fef7649fb524da6c59e14e7d18a0d", - "reference": "32866aac3d4fef7649fb524da6c59e14e7d18a0d", + "url": "https://api.github.com/repos/cakephp/utility/zipball/7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5", + "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5", "shasum": "" }, "require": { @@ -233,7 +233,7 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-07-16T21:24:52+00:00" + "time": "2022-08-19T06:02:03+00:00" }, { "name": "doctrine/lexer", @@ -496,16 +496,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -560,7 +560,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -576,7 +576,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", @@ -2136,16 +2136,16 @@ }, { "name": "symfony/console", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10" + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10", + "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", "shasum": "" }, "require": { @@ -2215,7 +2215,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.11" + "source": "https://github.com/symfony/console/tree/v5.4.12" }, "funding": [ { @@ -2231,7 +2231,7 @@ "type": "tidelift" } ], - "time": "2022-07-22T10:42:43+00:00" + "time": "2022-08-17T13:18:05+00:00" }, { "name": "symfony/css-selector", @@ -2457,16 +2457,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7" + "reference": "291c1e92281a09152dda089f782e23dedd34bd4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0b900ca5576ecd59e08c76127e616667cfe427a7", - "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291c1e92281a09152dda089f782e23dedd34bd4f", + "reference": "291c1e92281a09152dda089f782e23dedd34bd4f", "shasum": "" }, "require": { @@ -2512,7 +2512,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.11" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.12" }, "funding": [ { @@ -2528,7 +2528,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2022-08-03T13:09:21+00:00" }, { "name": "symfony/event-dispatcher", @@ -2696,16 +2696,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd" + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", "shasum": "" }, "require": { @@ -2740,7 +2740,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.11" + "source": "https://github.com/symfony/filesystem/tree/v5.4.12" }, "funding": [ { @@ -2756,7 +2756,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2022-08-02T13:48:16+00:00" }, { "name": "symfony/finder", @@ -2823,16 +2823,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389" + "reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0a5868e0999e9d47859ba3d918548ff6943e6389", - "reference": "0a5868e0999e9d47859ba3d918548ff6943e6389", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4bfe9611b113b15d98a43da68ec9b5a00d56791", + "reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791", "shasum": "" }, "require": { @@ -2844,8 +2844,11 @@ "require-dev": { "predis/predis": "~1.0", "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0" + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0" }, "suggest": { "symfony/mime": "To use the file extension guesser" @@ -2876,7 +2879,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.11" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.12" }, "funding": [ { @@ -2892,20 +2895,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2022-08-19T07:33:17+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "9f34f71ec05cef8a0d434988476ee9fd32075a6c" + "reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/9f34f71ec05cef8a0d434988476ee9fd32075a6c", - "reference": "9f34f71ec05cef8a0d434988476ee9fd32075a6c", + "url": "https://api.github.com/repos/symfony/mailer/zipball/076043af11e58b20a68d2fd93f59cdbc6e8fdd00", + "reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00", "shasum": "" }, "require": { @@ -2952,7 +2955,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.11" + "source": "https://github.com/symfony/mailer/tree/v5.4.12" }, "funding": [ { @@ -2968,20 +2971,20 @@ "type": "tidelift" } ], - "time": "2022-07-24T16:05:20+00:00" + "time": "2022-08-03T05:17:26+00:00" }, { "name": "symfony/mime", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830" + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/3cd175cdcdb6db2e589e837dd46aff41027d9830", - "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830", + "url": "https://api.github.com/repos/symfony/mime/zipball/03876e9c5a36f5b45e7d9a381edda5421eff8a90", + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90", "shasum": "" }, "require": { @@ -3035,7 +3038,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.11" + "source": "https://github.com/symfony/mime/tree/v5.4.12" }, "funding": [ { @@ -3051,7 +3054,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T11:34:24+00:00" + "time": "2022-08-19T14:24:03+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4017,16 +4020,16 @@ }, { "name": "symfony/string", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322" + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322", + "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", "shasum": "" }, "require": { @@ -4083,7 +4086,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.11" + "source": "https://github.com/symfony/string/tree/v5.4.12" }, "funding": [ { @@ -4099,7 +4102,7 @@ "type": "tidelift" } ], - "time": "2022-07-24T16:15:25+00:00" + "time": "2022-08-12T17:03:11+00:00" }, { "name": "symfony/var-exporter", @@ -4176,16 +4179,16 @@ }, { "name": "symfony/yaml", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e" + "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/05d4ea560f3402c6c116afd99fdc66e60eda227e", - "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c", + "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c", "shasum": "" }, "require": { @@ -4231,7 +4234,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.11" + "source": "https://github.com/symfony/yaml/tree/v5.4.12" }, "funding": [ { @@ -4247,7 +4250,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2022-08-02T15:52:22+00:00" }, { "name": "voku/anti-xss", @@ -6000,16 +6003,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.10.3", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "da3166a06b4a89915920a42444f707122a1584c9" + "reference": "9141e6f8e1f044aa64aedb0e6894d12618cdcb3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9", - "reference": "da3166a06b4a89915920a42444f707122a1584c9", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9141e6f8e1f044aa64aedb0e6894d12618cdcb3e", + "reference": "9141e6f8e1f044aa64aedb0e6894d12618cdcb3e", "shasum": "" }, "require": { @@ -6045,7 +6048,7 @@ "description": "Official version of pdepend to be handled with Composer", "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.10.3" + "source": "https://github.com/pdepend/pdepend/tree/2.11.0" }, "funding": [ { @@ -6053,7 +6056,7 @@ "type": "tidelift" } ], - "time": "2022-02-23T07:53:09+00:00" + "time": "2022-08-29T11:21:12+00:00" }, { "name": "phar-io/manifest", @@ -6290,6 +6293,7 @@ "issues": "https://github.com/PHP-CS-Fixer/diff/issues", "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" }, + "abandoned": true, "time": "2020-10-14T08:32:19+00:00" }, { @@ -6774,23 +6778,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -6839,7 +6843,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -6847,7 +6851,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7092,16 +7096,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.21", + "version": "9.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", "shasum": "" }, "require": { @@ -7116,7 +7120,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -7131,12 +7134,9 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.1", "sebastian/version": "^3.0.2" }, - "require-dev": { - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -7178,7 +7178,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" }, "funding": [ { @@ -7190,7 +7190,7 @@ "type": "github" } ], - "time": "2022-06-19T12:14:25+00:00" + "time": "2022-08-30T07:42:16+00:00" }, { "name": "sanmai/later", @@ -8167,16 +8167,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb44e1cc6e557418387ad815780360057e40753e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e", + "reference": "fb44e1cc6e557418387ad815780360057e40753e", "shasum": "" }, "require": { @@ -8188,7 +8188,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -8211,7 +8211,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.1.0" }, "funding": [ { @@ -8219,7 +8219,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-08-29T06:55:37+00:00" }, { "name": "sebastian/version", From 0052ea9fb156b33d06433a25c6e5301c899b0256 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 30 Aug 2022 22:42:50 +0700 Subject: [PATCH 169/212] Updated current version in README (2.1.1). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31e859904..dbfd88f22 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ PHP Censor versions: | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.0` | `release-2.1` | Current stable version | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.1` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 3bd1c8e61ceb0c567262a80d979bb6859fed444e Mon Sep 17 00:00:00 2001 From: Pavel Starosek Date: Wed, 31 Aug 2022 00:06:35 +0600 Subject: [PATCH 170/212] Typo --- src/Logging/BuildDBLogHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index a0cfbd9a9..4b33ab3c1 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -79,7 +79,7 @@ private function sanitize(string $message): string ROOT_DIR, ], [ '/', - '//', + '/', '/', '/', ], $message); From d2d5f83ce8f34ec2dd9ca0c489d8a62c43667003 Mon Sep 17 00:00:00 2001 From: Pavel Starosek Date: Wed, 31 Aug 2022 00:06:35 +0600 Subject: [PATCH 171/212] Typo (cherry picked from commit 3bd1c8e61ceb0c567262a80d979bb6859fed444e) --- src/Logging/BuildDBLogHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index a0cfbd9a9..4b33ab3c1 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -79,7 +79,7 @@ private function sanitize(string $message): string ROOT_DIR, ], [ '/', - '//', + '/', '/', '/', ], $message); From c177d8d18c67565f3073e9663c6bf42350f826f0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 1 Sep 2022 17:32:07 +0700 Subject: [PATCH 172/212] Fixed type of GET param 'commitId' in WebhookController. Issue #432. --- src/Controller/WebhookController.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index bce74c805..1a301cc67 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -344,9 +344,9 @@ public function git(int $projectId): array $payload = [ 'branch' => $this->getParam('branch', $project->getDefaultBranch()), 'environment' => $this->getParam('environment'), - 'commit' => $this->getParam('commit'), - 'commit_message' => $this->getParam('message', ''), - 'committer' => $this->getParam('committer', ''), + 'commit' => (string)$this->getParam('commit', ''), + 'commit_message' => (string)$this->getParam('message', ''), + 'committer' => (string)$this->getParam('committer', ''), ]; $payloadJson = \json_encode($payload); @@ -384,9 +384,9 @@ public function hg(int $projectId): array $payload = [ 'branch' => $this->getParam('branch', $project->getDefaultBranch()), 'environment' => $this->getParam('environment'), - 'commit' => $this->getParam('commit'), - 'commit_message' => $this->getParam('message'), - 'committer' => $this->getParam('committer'), + 'commit' => (string)$this->getParam('commit', ''), + 'commit_message' => (string)$this->getParam('message', ''), + 'committer' => (string)$this->getParam('committer', ''), ]; $payloadJson = \json_encode($payload); @@ -425,9 +425,9 @@ public function svn(int $projectId): array $payload = [ 'branch' => $this->getParam('branch', $project->getDefaultBranch()), 'environment' => $this->getParam('environment'), - 'commit' => $this->getParam('commit'), - 'commit_message' => $this->getParam('message'), - 'committer' => $this->getParam('committer'), + 'commit' => (string)$this->getParam('commit', ''), + 'commit_message' => (string)$this->getParam('message', ''), + 'committer' => (string)$this->getParam('committer', ''), ]; $payloadJson = \json_encode($payload); @@ -521,7 +521,7 @@ protected function bitbucketCommitRequest(Project $project, array $payload): arr try { $email = $commit['new']['target']['author']['raw']; if (\strpos($email, '>') !== false) { - // In order not to loose email if it is RAW, w/o "<>" symbols + // In order not to lose email if it is RAW, w/o "<>" symbols $email = \substr($email, 0, \strpos($email, '>')); $email = \substr($email, \strpos($email, '<') + 1); } @@ -600,7 +600,7 @@ protected function bitbucketPullRequest(Project $project, array $payload): array $branch = $payload['pullrequest']['destination']['branch']['name']; $committer = $commit['author']['raw']; if (\strpos($committer, '>') !== false) { - // In order not to loose email if it is RAW, w/o "<>" symbols + // In order not to lose email if it is RAW, w/o "<>" symbols $committer = \substr($committer, 0, \strpos($committer, '>')); $committer = \substr($committer, \strpos($committer, '<') + 1); } From de1e91cddb0f59c0ea47e69e750052a2d403af80 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 1 Sep 2022 17:54:07 +0700 Subject: [PATCH 173/212] Fixes for secrets: denied to using secrets in notify plugins content. --- src/Builder.php | 8 ++++---- src/Helper/BuildInterpolator.php | 6 ++++-- src/Plugin.php | 8 ++++---- src/Plugin/BitbucketNotify.php | 2 +- src/Plugin/CampfireNotify.php | 2 +- src/Plugin/Deployer.php | 8 ++++---- src/Plugin/Env.php | 2 +- src/Plugin/FlowdockNotify.php | 2 +- src/Plugin/Git.php | 12 ++++++------ src/Plugin/HipchatNotify.php | 2 +- src/Plugin/Mage.php | 2 +- src/Plugin/Mage3.php | 4 ++-- src/Plugin/Mysql.php | 18 +++++++++--------- src/Plugin/PackageBuild.php | 2 +- src/Plugin/Pgsql.php | 12 ++++++------ src/Plugin/PhpCsFixer.php | 2 +- src/Plugin/PhpUnit.php | 2 +- src/Plugin/SensiolabsInsight.php | 2 +- src/Plugin/Sqlite.php | 2 +- src/Plugin/TelegramNotify.php | 4 ++-- src/Service/BuildService.php | 2 +- 21 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/Builder.php b/src/Builder.php index b8692ba77..075b78095 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -342,9 +342,9 @@ public function findBinary( * Replace every occurrence of the interpolation vars in the given string * Example: "This is build %BUILD_ID%" => "This is build 182" */ - public function interpolate(string $input): string + public function interpolate(string $input, bool $useSecrets = false): string { - return $this->interpolator->interpolate($input); + return $this->interpolator->interpolate($input, $useSecrets); } /** @@ -389,7 +389,7 @@ protected function setupBuild(): bool if (!empty($this->config['build_settings']['binary_path'])) { $this->binaryPath = \rtrim( - $this->interpolate($this->config['build_settings']['binary_path']), + $this->interpolate($this->config['build_settings']['binary_path'], true), '/\\' ) . '/'; } @@ -411,7 +411,7 @@ protected function setupBuild(): bool } $this->directory = \rtrim( - $this->interpolate($directory), + $this->interpolate($directory, true), '/\\' ) . '/'; diff --git a/src/Helper/BuildInterpolator.php b/src/Helper/BuildInterpolator.php index d2cf828d3..ef8db63e4 100644 --- a/src/Helper/BuildInterpolator.php +++ b/src/Helper/BuildInterpolator.php @@ -122,9 +122,11 @@ private function secretInterpolate(string $input): string * Replace every occurrence of the interpolation vars in the given string * Example: "This is build %BUILD_ID%" => "This is build 182" */ - public function interpolate(string $input): string + public function interpolate(string $input, bool $useSecrets = false): string { - $input = $this->secretInterpolate($input); + if ($useSecrets) { + $input = $this->secretInterpolate($input); + } $input = $this->realtimeInterpolate($input); $keys = \array_keys($this->interpolationVars); diff --git a/src/Plugin.php b/src/Plugin.php index 103f6f31c..adc7f278f 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -114,7 +114,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) */ protected function normalizePath($rawPath) { - $normalizedPath = $this->builder->interpolate($rawPath); + $normalizedPath = $this->builder->interpolate($rawPath, true); if ('/' !== \substr($rawPath, 0, 1)) { $normalizedPath = $this->build->getBuildPath() . $normalizedPath; @@ -141,7 +141,7 @@ protected function normalizeBinaryPath() { $binaryPath = ''; if (!empty($this->options['binary_path'])) { - $optionBinaryPath = $this->builder->interpolate($this->options['binary_path']); + $optionBinaryPath = $this->builder->interpolate($this->options['binary_path'], true); if ('/' !== \substr($optionBinaryPath, 0, 1)) { $binaryPath = $this->build->getBuildPath(); @@ -177,7 +177,7 @@ protected function normalizeDirectory() $directory = ''; if (!empty($this->options['directory'])) { - $optionDirectory = $this->builder->interpolate($this->options['directory']); + $optionDirectory = $this->builder->interpolate($this->options['directory'], true); if ('/' !== \substr($optionDirectory, 0, 1)) { $directory = $this->build->getBuildPath(); @@ -220,7 +220,7 @@ protected function normalizeIgnore() $baseDirectory = $this->builder->buildPath; \array_walk($ignore, function (&$value) use ($baseDirectory) { - $value = $this->builder->interpolate($value); + $value = $this->builder->interpolate($value, true); if ('/' !== \substr($value, 0, 1)) { $value = $baseDirectory . $value; diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index e0ca9b62c..ba56850f1 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -77,7 +77,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->updateBuild = $options['update_build']; if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token']); + $this->authToken = $this->builder->interpolate($options['auth_token'], true); } if (empty($this->message)) { diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index 9b79b84d5..7645ee25b 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -57,7 +57,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->url = $campfire['url']; if (\array_key_exists('auth_token', $campfire)) { - $this->authToken = $this->builder->interpolate($campfire['auth_token']); + $this->authToken = $this->builder->interpolate($campfire['auth_token'], true); } if (\array_key_exists('room', $campfire)) { diff --git a/src/Plugin/Deployer.php b/src/Plugin/Deployer.php index 5de2ee4c9..71bcb377e 100644 --- a/src/Plugin/Deployer.php +++ b/src/Plugin/Deployer.php @@ -65,11 +65,11 @@ public function execute() $this->webhookUrl, [ 'form_params' => [ - 'reason' => $this->builder->interpolate($this->reason), + 'reason' => $this->builder->interpolate($this->reason, true), 'source' => 'PHP Censor', - 'url' => $this->builder->interpolate('%BUILD_LINK%'), - 'branch' => $this->builder->interpolate('%BRANCH%'), - 'commit' => $this->builder->interpolate('%COMMIT_ID%'), + 'url' => $this->builder->interpolate('%BUILD_LINK%', true), + 'branch' => $this->builder->interpolate('%BRANCH%', true), + 'commit' => $this->builder->interpolate('%COMMIT_ID%', true), 'update_only' => $this->updateOnly, ] ] diff --git a/src/Plugin/Env.php b/src/Plugin/Env.php index 8f65eba57..934868044 100644 --- a/src/Plugin/Env.php +++ b/src/Plugin/Env.php @@ -40,7 +40,7 @@ public function execute() $envVar = "$key=$value"; } - if (!\putenv($this->builder->interpolate($envVar))) { + if (!\putenv($this->builder->interpolate($envVar, true))) { $success = false; $this->builder->logFailure('Unable to set environment variable'); } diff --git a/src/Plugin/FlowdockNotify.php b/src/Plugin/FlowdockNotify.php index 8bcf8c6f4..fb5e236a5 100644 --- a/src/Plugin/FlowdockNotify.php +++ b/src/Plugin/FlowdockNotify.php @@ -49,7 +49,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token']); + $this->authToken = $this->builder->interpolate($options['auth_token'], true); } $this->message = isset($options['message']) ? $options['message'] : self::MESSAGE_DEFAULT; diff --git a/src/Plugin/Git.php b/src/Plugin/Git.php index 19b678800..9741ef5e2 100644 --- a/src/Plugin/Git.php +++ b/src/Plugin/Git.php @@ -113,11 +113,11 @@ protected function runTagAction($options) $message = \sprintf('Tag created by PHP Censor: %s', \date('Y-m-d H:i:s')); if (\array_key_exists('name', $options)) { - $tagName = $this->builder->interpolate($options['name']); + $tagName = $this->builder->interpolate($options['name'], true); } if (\array_key_exists('message', $options)) { - $message = $this->builder->interpolate($options['message']); + $message = $this->builder->interpolate($options['message'], true); } $cmd = 'git tag %s -m "%s"'; @@ -136,11 +136,11 @@ protected function runPullAction($options) $remote = 'origin'; if (\array_key_exists('branch', $options)) { - $branch = $this->builder->interpolate($options['branch']); + $branch = $this->builder->interpolate($options['branch'], true); } if (\array_key_exists('remote', $options)) { - $remote = $this->builder->interpolate($options['remote']); + $remote = $this->builder->interpolate($options['remote'], true); } return $this->builder->executeCommand('git pull %s %s', $remote, $branch); @@ -157,11 +157,11 @@ protected function runPushAction($options) $remote = 'origin'; if (\array_key_exists('branch', $options)) { - $branch = $this->builder->interpolate($options['branch']); + $branch = $this->builder->interpolate($options['branch'], true); } if (\array_key_exists('remote', $options)) { - $remote = $this->builder->interpolate($options['remote']); + $remote = $this->builder->interpolate($options['remote'], true); } return $this->builder->executeCommand('git push %s %s', $remote, $branch); diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php index 6cda08859..592593be4 100644 --- a/src/Plugin/HipchatNotify.php +++ b/src/Plugin/HipchatNotify.php @@ -45,7 +45,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token']); + $this->authToken = $this->builder->interpolate($options['auth_token'], true); } $this->room = $options['room']; diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index d86857c04..32668d434 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -38,7 +38,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['mage', 'mage.phar']); if (isset($options['env'])) { - $this->mageEnv = $builder->interpolate($options['env']); + $this->mageEnv = $builder->interpolate($options['env'], true); } } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index 587a36e26..df3f3c728 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -39,11 +39,11 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['mage', 'mage.phar']); if (isset($options['env'])) { - $this->mageEnv = $builder->interpolate($options['env']); + $this->mageEnv = $builder->interpolate($options['env'], true); } if (isset($options['log_dir'])) { - $this->mageLogDir = $builder->interpolate($options['log_dir']); + $this->mageLogDir = $builder->interpolate($options['log_dir'], true); } } diff --git a/src/Plugin/Mysql.php b/src/Plugin/Mysql.php index 662c09ca4..04e469bc5 100644 --- a/src/Plugin/Mysql.php +++ b/src/Plugin/Mysql.php @@ -88,19 +88,19 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (!empty($buildSettings['mysql']['host'])) { - $this->host = $this->builder->interpolate($buildSettings['mysql']['host']); + $this->host = $this->builder->interpolate($buildSettings['mysql']['host'], true); } if (!empty($buildSettings['mysql']['port'])) { - $this->port = (int)$this->builder->interpolate($buildSettings['mysql']['port']); + $this->port = (int)$this->builder->interpolate($buildSettings['mysql']['port'], true); } if (!empty($buildSettings['mysql']['dbname'])) { - $this->dbName = $this->builder->interpolate($buildSettings['mysql']['dbname']); + $this->dbName = $this->builder->interpolate($buildSettings['mysql']['dbname'], true); } if (!empty($buildSettings['mysql']['charset'])) { - $this->charset = $this->builder->interpolate($buildSettings['mysql']['charset']); + $this->charset = $this->builder->interpolate($buildSettings['mysql']['charset'], true); } if (!empty($buildSettings['mysql']['options']) && \is_array($buildSettings['mysql']['options'])) { @@ -108,16 +108,16 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (!empty($buildSettings['mysql']['user'])) { - $this->user = $this->builder->interpolate($buildSettings['mysql']['user']); + $this->user = $this->builder->interpolate($buildSettings['mysql']['user'], true); } if (\array_key_exists('password', $buildSettings['mysql'])) { - $this->password = $this->builder->interpolate($buildSettings['mysql']['password']); + $this->password = $this->builder->interpolate($buildSettings['mysql']['password'], true); } if (!empty($this->options['queries']) && \is_array($this->options['queries'])) { foreach ($this->options['queries'] as $query) { - $this->queries[] = $this->builder->interpolate($query); + $this->queries[] = $this->builder->interpolate($query, true); } } @@ -175,12 +175,12 @@ protected function executeFile(array $query) throw new InvalidArgumentException('Import statement must contain a \'file\' key'); } - $importFile = $this->builder->buildPath . $this->builder->interpolate($query['file']); + $importFile = $this->builder->buildPath . $this->builder->interpolate($query['file'], true); if (!\is_readable($importFile)) { throw new RuntimeException(\sprintf('Cannot open SQL import file: %s', $importFile)); } - $database = isset($query['database']) ? $this->builder->interpolate($query['database']) : null; + $database = isset($query['database']) ? $this->builder->interpolate($query['database'], true) : null; $importCommand = $this->getImportCommand($importFile, $database); if (!$this->builder->executeCommand($importCommand)) { diff --git a/src/Plugin/PackageBuild.php b/src/Plugin/PackageBuild.php index 96dbd04f1..e69fc7ad2 100644 --- a/src/Plugin/PackageBuild.php +++ b/src/Plugin/PackageBuild.php @@ -73,7 +73,7 @@ public function execute() $success = $this->builder->executeCommand( $cmd, $this->directory, - $this->builder->interpolate($filename) + $this->builder->interpolate($filename, true) ); } diff --git a/src/Plugin/Pgsql.php b/src/Plugin/Pgsql.php index d25d4ee23..88a6f6e1c 100644 --- a/src/Plugin/Pgsql.php +++ b/src/Plugin/Pgsql.php @@ -72,15 +72,15 @@ public function __construct(Builder $builder, Build $build, array $options = []) $buildSettings = $this->builder->getConfig('build_settings'); if (!empty($buildSettings['pgsql']['host'])) { - $this->host = $this->builder->interpolate($buildSettings['pgsql']['host']); + $this->host = $this->builder->interpolate($buildSettings['pgsql']['host'], true); } if (!empty($buildSettings['pgsql']['port'])) { - $this->port = (int)$this->builder->interpolate($buildSettings['pgsql']['port']); + $this->port = (int)$this->builder->interpolate($buildSettings['pgsql']['port'], true); } if (!empty($buildSettings['pgsql']['dbname'])) { - $this->dbName = $this->builder->interpolate($buildSettings['pgsql']['dbname']); + $this->dbName = $this->builder->interpolate($buildSettings['pgsql']['dbname'], true); } if (!empty($buildSettings['pgsql']['options']) && \is_array($buildSettings['pgsql']['options'])) { @@ -88,16 +88,16 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (!empty($buildSettings['pgsql']['user'])) { - $this->user = $this->builder->interpolate($buildSettings['pgsql']['user']); + $this->user = $this->builder->interpolate($buildSettings['pgsql']['user'], true); } if (\array_key_exists('password', $buildSettings['pgsql'])) { - $this->password = $this->builder->interpolate($buildSettings['pgsql']['password']); + $this->password = $this->builder->interpolate($buildSettings['pgsql']['password'], true); } if (!empty($this->options['queries']) && \is_array($this->options['queries'])) { foreach ($this->options['queries'] as $query) { - $this->queries[] = $this->builder->interpolate($query); + $this->queries[] = $this->builder->interpolate($query, true); } } } diff --git a/src/Plugin/PhpCsFixer.php b/src/Plugin/PhpCsFixer.php index 72c3a5634..369368200 100644 --- a/src/Plugin/PhpCsFixer.php +++ b/src/Plugin/PhpCsFixer.php @@ -69,7 +69,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) if (isset($options['config']) && $options['config']) { $this->config = true; - $this->args .= ' --config=' . $builder->interpolate($options['config']); + $this->args .= ' --config=' . $builder->interpolate($options['config'], true); } if (isset($options['errors']) && $options['errors']) { diff --git a/src/Plugin/PhpUnit.php b/src/Plugin/PhpUnit.php index bf7d407fc..aa8aad285 100644 --- a/src/Plugin/PhpUnit.php +++ b/src/Plugin/PhpUnit.php @@ -189,7 +189,7 @@ protected function runConfig($directory, $configFile, $logFormat) } } - $arguments = $this->builder->interpolate($options->buildArgumentString()); + $arguments = $this->builder->interpolate($options->buildArgumentString(), true); $cmd = $this->executable . ' %s %s'; if ($options->getOption('coverage')) { diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index f312b7a8b..6477bacdb 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -65,7 +65,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token']); + $this->authToken = $this->builder->interpolate($options['auth_token'], true); } if (\array_key_exists('project_uuid', $options)) { diff --git a/src/Plugin/Sqlite.php b/src/Plugin/Sqlite.php index c052e70b4..9da80f889 100644 --- a/src/Plugin/Sqlite.php +++ b/src/Plugin/Sqlite.php @@ -65,7 +65,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) if (!empty($this->options['queries']) && \is_array($this->options['queries'])) { foreach ($this->options['queries'] as $query) { - $this->queries[] = $this->builder->interpolate($query); + $this->queries[] = $this->builder->interpolate($query, true); } } } diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index 9b761cd16..e149bf1ee 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -52,7 +52,7 @@ public function __construct(Builder $builder, Build $build, array $options = []) } if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token']); + $this->authToken = $this->builder->interpolate($options['auth_token'], true); } $this->message = '[%ICON_BUILD%] [%PROJECT_TITLE%](%PROJECT_LINK%)' . @@ -86,7 +86,7 @@ public function execute() foreach ($this->recipients as $chatId) { $params = [ - 'chat_id' => $this->builder->interpolate($chatId), + 'chat_id' => $this->builder->interpolate($chatId, true), 'text' => $message, 'parse_mode' => 'Markdown', ]; diff --git a/src/Service/BuildService.php b/src/Service/BuildService.php index 1617687af..ac12d10a1 100644 --- a/src/Service/BuildService.php +++ b/src/Service/BuildService.php @@ -92,7 +92,7 @@ public function createBuild( $userId = null; } $build->setUserId($userId); - $build->setCommitId((string)$commitId); + $build->setCommitId($commitId); if (!empty($branch)) { $build->setBranch($branch); From 877ffebcaafe339b1f8e745cc814dba6f8c25056 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 1 Sep 2022 18:58:18 +0700 Subject: [PATCH 174/212] Fixed response. Issue #432. --- src/Controller/WebhookController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/WebhookController.php b/src/Controller/WebhookController.php index 1a301cc67..0b710ff50 100644 --- a/src/Controller/WebhookController.php +++ b/src/Controller/WebhookController.php @@ -88,7 +88,7 @@ public function handleAction(string $action, array $actionParams): Response $response->setStatusCode($data['responseCode']); unset($data['responseCode']); } - $response->setContent($data); + $response->setData($data); } catch (\Throwable $ex) { $response->setStatusCode(500); $response->setData(['status' => 'failed', 'error' => $ex->getMessage()]); From 3b4ca9df0cda7dd1efac2dcfd1e18df2a369312a Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 1 Sep 2022 23:33:27 +0700 Subject: [PATCH 175/212] Added changelog for version 2.1.2 and upgrade VERSION.md for release 2.1.2. --- CHANGELOG.md | 12 ++++++++++++ VERSION.md | 2 +- composer.lock | 18 +++++++++++------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38221c9ba..8d8bfcad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.2 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.2) (2022-09-01) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.1...2.1.2) + +### Fixed + +- Build logger expression. Pull requests [#431](https://github.com/php-censor/php-censor/pull/431). Thanks to [@StudioMaX](https://github.com/StudioMaX). +- Type of GET param `commitId` in WebhookController. Issue [#432](https://github.com/php-censor/php-censor/pull/432). +- Webhook response type. Issue [#432](https://github.com/php-censor/php-censor/pull/432). +- Secrets security: denied to using secrets in notify plugins content. + + ## [2.1.1 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.1) (2022-08-30) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.0...2.1.1) diff --git a/VERSION.md b/VERSION.md index 3e3c2f1e5..eca07e4c1 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.1 +2.1.2 diff --git a/composer.lock b/composer.lock index 3340b2cf8..34b1507d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4411,16 +4411,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.5", + "version": "6.0.9", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4" + "reference": "eb2861c34203a9c2a7c275cba7014d6816604e89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/6c764c2c4fcad451a0f6622260a4934cfea08aa4", - "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/eb2861c34203a9c2a7c275cba7014d6816604e89", + "reference": "eb2861c34203a9c2a7c275cba7014d6816604e89", "shasum": "" }, "require": { @@ -4433,7 +4433,11 @@ "voku/portable-ascii": "~2.0.0" }, "require-dev": { - "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + "phpstan/phpstan": "1.8.*@dev", + "phpstan/phpstan-strict-rules": "1.4.*@dev", + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0", + "thecodingmachine/phpstan-strict-rules": "1.0.*@dev", + "voku/phpstan-rules": "3.1.*@dev" }, "suggest": { "ext-ctype": "Use Ctype for e.g. hexadecimal digit detection", @@ -4482,7 +4486,7 @@ ], "support": { "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.5" + "source": "https://github.com/voku/portable-utf8/tree/6.0.9" }, "funding": [ { @@ -4506,7 +4510,7 @@ "type": "tidelift" } ], - "time": "2022-08-10T12:32:31+00:00" + "time": "2022-09-01T09:54:03+00:00" } ], "packages-dev": [ From 7c50095a192e53538fa0bd2be5f00d6e9b84b54e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 1 Sep 2022 23:45:52 +0700 Subject: [PATCH 176/212] Updated current version in README (2.1.2). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dbfd88f22..af70f4e8b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ PHP Censor versions: | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.1` | `release-2.1` | Current stable version | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.2` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From da840e290b814eefe77016d2cf818fecf6a3c3ce Mon Sep 17 00:00:00 2001 From: StudioMaX Date: Thu, 1 Sep 2022 23:48:32 +0600 Subject: [PATCH 177/212] Remove HipChat as it was shut down in 2019 --- README.md | 2 +- composer.json | 1 - composer.lock | 48 +--------------- docs/en/README.md | 1 - docs/en/plugins/hipchat_notify.md | 36 ------------ src/Languages/lang.en.php | 1 - src/Languages/lang.es.php | 1 - src/Languages/lang.fr.php | 1 - src/Languages/lang.id.php | 1 - src/Languages/lang.my.php | 1 - src/Languages/lang.pt-br.php | 1 - src/Languages/lang.ru.php | 1 - src/Plugin/HipchatNotify.php | 96 ------------------------------- 13 files changed, 2 insertions(+), 189 deletions(-) delete mode 100644 docs/en/plugins/hipchat_notify.md delete mode 100644 src/Plugin/HipchatNotify.php diff --git a/README.md b/README.md index af70f4e8b..8e584693d 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ PHPMessDetector, PHPTalLint and TechnicalDebt; * Run through any combination of the other [supported plugins](docs/en/README.md#plugins), including Campfire, CleanBuild, CopyBuild, Deployer, Env, Git, Grunt, Gulp, PackageBuild, Phar, Phing, Shell and Wipe; -* Send notifications to Email, XMPP, Slack, IRC, Flowdock, HipChat and +* Send notifications to Email, XMPP, Slack, IRC, Flowdock and [Telegram](docs/en/plugins/telegram_notify.md); * Use your LDAP-server for authentication; diff --git a/composer.json b/composer.json index b260263bf..74b26eb12 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,6 @@ "sebastian/diff": "^4.0", "maknz/slack": "^1.7", - "hipchat/hipchat-php": "^1.4", "php-censor/flowdock-client": "^2.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 34b1507d4..1679fa527 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "20b1f00489615f4ab268d26b842fdd1d", + "content-hash": "9338892db5fc6bdd5295204471d78718", "packages": [ { "name": "cakephp/core", @@ -688,52 +688,6 @@ ], "time": "2022-06-20T21:43:03+00:00" }, - { - "name": "hipchat/hipchat-php", - "version": "v1.4", - "source": { - "type": "git", - "url": "https://github.com/hipchat/hipchat-php.git", - "reference": "5936c0a48d2d514d94bfc1d774b04c42cd3bc39e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hipchat/hipchat-php/zipball/5936c0a48d2d514d94bfc1d774b04c42cd3bc39e", - "reference": "5936c0a48d2d514d94bfc1d774b04c42cd3bc39e", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "HipChat": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "HipChat", - "email": "support@hipchat.com", - "homepage": "https://www.hipchat.com", - "role": "Company" - } - ], - "description": "PHP library for HipChat", - "homepage": "http://github.com/hipchat/hipchat-php", - "keywords": [ - "hipchat" - ], - "support": { - "issues": "https://github.com/hipchat/hipchat-php/issues", - "source": "https://github.com/hipchat/hipchat-php/tree/master" - }, - "time": "2015-04-28T22:48:40+00:00" - }, { "name": "jasongrimes/paginator", "version": "1.0.3", diff --git a/docs/en/README.md b/docs/en/README.md index 6a937707f..eb00f0a7e 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -85,7 +85,6 @@ Plugins * [Campfire](plugins/campfire_notify.md) - `campfire_notify` * [Email](plugins/email_notify.md) - `email_notify` * [FlowDock](plugins/flowdock_notify.md) - `flowdock_notify` -* [HipChat](plugins/hipchat_notify.md) - `hipchat_notify` * [IRC](plugins/irc_notify.md) - `irc_notify` * [Slack](plugins/slack_notify.md) - `slack_notify` * [Telegram](plugins/telegram_notify.md) - `telegram_notify` diff --git a/docs/en/plugins/hipchat_notify.md b/docs/en/plugins/hipchat_notify.md deleted file mode 100644 index 6dfa9a10f..000000000 --- a/docs/en/plugins/hipchat_notify.md +++ /dev/null @@ -1,36 +0,0 @@ -Plugin Hipchat Notify -===================== - -This plugin joins a [HipChat](https://www.hipchat.com/) room and sends a user-defined message, for example a -"Build Succeeded" message. - -Configuration -------------- - -### Options - -| Field | Required? | Description | -|-------|-----------|-------------| -| `auth_token` | Yes | Your HipChat API authentication token (v1) | -| `room` | Yes | Your Hipchat room name or ID number. This can also be an array of room names or numbers, and the message will be sent to all rooms. | -| `message` | No | The message to send to the room. Default - `%PROJECT_TITLE% built at %BUILD_LINK%` | -| `color` | No | Message color. Valid values: yellow, green, red, purple, gray, random. Default - `yellow`| -| `notify` | No | Whether or not this message should trigger a notification for people in the room (change the tab color, play a sound, etc). Default - `false`. | - -Message can be formatted via HTML. Example: -```html -%PROJECT_TITLE% - build %BUILD_ID% failed! -``` - -### Examples - -```yml -success: - hipchat_notify_step: - plugin: hipchat_notify - auth_token: 123 - room: 456 - message: '%PROJECT_TITLE% - build %BUILD_ID% failed!' - color: red - notify: true -``` diff --git a/src/Languages/lang.en.php b/src/Languages/lang.en.php index 210fd8f3d..dd7677855 100644 --- a/src/Languages/lang.en.php +++ b/src/Languages/lang.en.php @@ -431,7 +431,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc_notify' => 'IRC Notify', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.es.php b/src/Languages/lang.es.php index abba6e063..e982c42c0 100644 --- a/src/Languages/lang.es.php +++ b/src/Languages/lang.es.php @@ -415,7 +415,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc' => 'IRC', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.fr.php b/src/Languages/lang.fr.php index dd1fedb69..d0e23ee79 100644 --- a/src/Languages/lang.fr.php +++ b/src/Languages/lang.fr.php @@ -405,7 +405,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc_notify' => 'IRC Notify', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.id.php b/src/Languages/lang.id.php index 7da0b3395..e871d51ce 100644 --- a/src/Languages/lang.id.php +++ b/src/Languages/lang.id.php @@ -412,7 +412,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc' => 'IRC', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.my.php b/src/Languages/lang.my.php index d8db7cdf5..29099f2d2 100644 --- a/src/Languages/lang.my.php +++ b/src/Languages/lang.my.php @@ -413,7 +413,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc' => 'IRC', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.pt-br.php b/src/Languages/lang.pt-br.php index 6f20fad51..b482ff238 100644 --- a/src/Languages/lang.pt-br.php +++ b/src/Languages/lang.pt-br.php @@ -423,7 +423,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc' => 'IRC', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Languages/lang.ru.php b/src/Languages/lang.ru.php index d2e568219..80a90a529 100644 --- a/src/Languages/lang.ru.php +++ b/src/Languages/lang.ru.php @@ -419,7 +419,6 @@ 'deployer' => 'Deployer', 'env' => 'Env', 'grunt' => 'Grunt', - 'hipchat_notify' => 'Hipchat Notify', 'irc_notify' => 'IRC Notify', 'lint' => 'Lint', 'mysql' => 'MySQL', diff --git a/src/Plugin/HipchatNotify.php b/src/Plugin/HipchatNotify.php deleted file mode 100644 index 592593be4..000000000 --- a/src/Plugin/HipchatNotify.php +++ /dev/null @@ -1,96 +0,0 @@ - - * @author Dmitry Khomutov - */ -class HipchatNotify extends Plugin -{ - protected $authToken; - protected $color; - protected $notify; - protected $message; - protected $room; - - /** - * @return string - */ - public static function pluginName() - { - return 'hipchat_notify'; - } - - /** - * {@inheritDoc} - */ - public function __construct(Builder $builder, Build $build, array $options = []) - { - parent::__construct($builder, $build, $options); - - if (!\is_array($options) || !isset($options['room']) || !isset($options['auth_token'])) { - throw new InvalidArgumentException('Please define room and authToken for hipchat_notify plugin.'); - } - - if (\array_key_exists('auth_token', $options)) { - $this->authToken = $this->builder->interpolate($options['auth_token'], true); - } - - $this->room = $options['room']; - - if (isset($options['message'])) { - $this->message = $options['message']; - } else { - $this->message = '%PROJECT_TITLE% built at %BUILD_LINK%'; - } - - if (isset($options['color'])) { - $this->color = $options['color']; - } else { - $this->color = 'yellow'; - } - - if (isset($options['notify'])) { - $this->notify = $options['notify']; - } else { - $this->notify = false; - } - } - - /** - * Run the HipChat plugin. - * @return bool - */ - public function execute() - { - $hipChat = new HipChat($this->authToken); - $message = $this->builder->interpolate($this->message); - - $result = true; - if (\is_array($this->room)) { - foreach ($this->room as $room) { - if (!$hipChat->message_room($room, 'PHP Censor', $message, $this->notify, $this->color)) { - $result = false; - } - } - } else { - if (!$hipChat->message_room($this->room, 'PHP Censor', $message, $this->notify, $this->color)) { - $result = false; - } - } - - return $result; - } -} From 83273e2608c881474bc69c0bc2cd6bd7a6039142 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 16 Sep 2022 22:19:27 +0700 Subject: [PATCH 178/212] Fixed docs. --- README.md | 25 +++++++++++++++++++++---- docs/en/installing.md | 4 ++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8e584693d..0fe4b3ad0 100644 --- a/README.md +++ b/README.md @@ -161,11 +161,28 @@ cd /path/to/php-censor ./vendor/bin/phpunit --configuration ./phpunit.xml.dist --coverage-html ./tests/runtime/coverage -vvv --colors=always ``` -For Phar plugin tests set 'phar.readonly' setting to Off (0) in `php.ini` config. Otherwise the tests will be skipped. +For Phar plugin tests set `phar.readonly` setting to Off (`0`) in `php.ini` config. Otherwise the tests will be skipped. -For database tests create an empty 'test_db' database on 'localhost' with user/password: `root/` -for MySQL and with user/password: `postgres/` for PostgreSQL (You can change default test user, password and -database name in `phpunit.xml[.dist]` config constants). If connection failed the tests will be skipped. +For database tests create an empty databases on 'localhost' with user/password for MySQL/PostgreSQL and set env +variables from `phpunit.xml.dist` config. For example: + +```shell +#!/usr/bin/env bash + +psql --username="test" --host="127.0.0.1" --echo-all --command="DROP DATABASE IF EXISTS \"php-censor-test\";" +psql --username="test" --host="127.0.0.1" --echo-all --command="CREATE DATABASE \"php-censor-test\";" + +mysql --user="test" --password="test" --host="127.0.0.1" --verbose --execute="CREATE DATABASE IF NOT EXISTS \`php-censor-test\`;" + +export SKIP_DB_TESTS=0;\ +export POSTGRESQL_DBNAME=php-censor-test;\ +export POSTGRESQL_USER=test;\ +export POSTGRESQL_PASSWORD=test;\ +export MYSQL_DBNAME=php-censor-test;\ +export MYSQL_USER=test;\ +export MYSQL_PASSWORD=test;\ +vendor/bin/phpunit --configuration=phpunit.xml.dist --verbose +``` ## Documentation diff --git a/docs/en/installing.md b/docs/en/installing.md index 1785f71fe..fd9aa498b 100644 --- a/docs/en/installing.md +++ b/docs/en/installing.md @@ -65,10 +65,10 @@ cd ./php-censor.local --admin-email='admin@php-censor.local' ``` -* [Add a virtual host to your web server](docs/en/virtual_host.md), pointing to the `public` directory within your new +* [Add a virtual host to your web server](virtual_host.md), pointing to the `public` directory within your new PHP Censor directory. You'll need to set up rewrite rules to point all non-existent requests to PHP Censor; -* [Set up the PHP Censor Worker](docs/en/workers/worker.md); +* [Set up the PHP Censor Worker](workers/worker.md); ## Installing via Docker From addff907adf13078c2b3fac0e336b055df041ed4 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 8 Nov 2022 23:14:43 +0700 Subject: [PATCH 179/212] Added Rector checks. --- Makefile | 8 +- composer.json | 3 +- composer.lock | 119 +++++++++++++++++- psalm.xml.dist | 3 +- rector.php | 23 ++++ src/Helper/CommandExecutor.php | 11 +- src/Plugin/Behat.php | 4 +- src/Plugin/BitbucketNotify.php | 2 +- src/Plugin/CampfireNotify.php | 3 +- src/Plugin/Composer.php | 16 +-- src/Plugin/Deployer.php | 3 +- src/Plugin/Grunt.php | 8 +- src/Plugin/Gulp.php | 8 +- src/Plugin/Mage.php | 4 +- src/Plugin/Mage3.php | 4 +- src/Plugin/Pdepend.php | 10 +- src/Plugin/PhpCodeSniffer.php | 19 +-- src/Plugin/PhpDocblockChecker.php | 4 +- src/Plugin/PhpLoc.php | 5 +- src/Plugin/PhpMessDetector.php | 10 +- src/Plugin/PhpParallelLint.php | 7 +- src/Plugin/SecurityChecker.php | 4 +- src/Plugin/SensiolabsInsight.php | 4 +- src/Plugin/TechnicalDebt.php | 10 +- .../Util/BitbucketNotifyPluginResult.php | 3 +- src/Plugin/Util/PhpUnitResult.php | 12 +- src/Plugin/Util/PhpUnitResultJson.php | 36 +++--- src/Plugin/Util/PhpUnitResultJunit.php | 4 +- src/Plugin/WebhookNotify.php | 2 +- src/Plugin/XmppNotify.php | 22 ++-- src/Store/BuildErrorStore.php | 15 +-- src/Store/BuildMetaStore.php | 11 +- src/Store/BuildStore.php | 32 ++--- src/Store/EnvironmentStore.php | 5 +- src/Store/ProjectStore.php | 17 +-- src/Store/UserStore.php | 4 +- src/Worker/BuildWorker.php | 3 +- 37 files changed, 252 insertions(+), 206 deletions(-) create mode 100644 rector.php diff --git a/Makefile b/Makefile index 84eb1c67d..ebbb9b0b9 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,14 @@ code-style-fix: php-info install ## Fix code style psalm: php-info install ## Run Psalm check $(PHP) vendor/bin/psalm --config=psalm.xml.dist --threads=4 --show-snippet=true --show-info=true +rector: php-info install ## Run Rector check + $(PHP) vendor/bin/rector --dry-run --clear-cache + +rector-fix: php-info install ## Run Rector fix + $(PHP) vendor/bin/rector --clear-cache + run-worker: php-info install ## Run PHP Censor worker $(PHP) bin/console php-censor:worker -v -.PHONY: php-info list install install-force update test test-coverage mutation-test code-style-fix psalm run-worker +.PHONY: php-info list install install-force update test test-coverage mutation-test code-style-fix psalm rector rector-fix run-worker .DEFAULT_GOAL := list diff --git a/composer.json b/composer.json index 74b26eb12..fee2d97b0 100644 --- a/composer.json +++ b/composer.json @@ -96,7 +96,8 @@ "php-censor/phpdoc-checker": "^3.0", "friendsofphp/php-cs-fixer": "^3.3", "symfony/var-dumper": "^4.4", - "vimeo/psalm": "^4.23" + "vimeo/psalm": "^4.23", + "rector/rector": "^0.14" }, "extra": { "platform": { diff --git a/composer.lock b/composer.lock index 1679fa527..c882b4543 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9338892db5fc6bdd5295204471d78718", + "content-hash": "e358ae009c0e1eb5935d495a57c18e1b", "packages": [ { "name": "cakephp/core", @@ -6734,6 +6734,65 @@ }, "time": "2020-07-09T08:33:42+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.8.10", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "0c4459dc42c568b818b3f25186589f3acddc1823" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0c4459dc42c568b818b3f25186589f3acddc1823", + "reference": "0c4459dc42c568b818b3f25186589f3acddc1823", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpstan/phpstan/issues", + "source": "https://github.com/phpstan/phpstan/tree/1.8.10" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2022-10-17T14:23:35+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.17", @@ -7150,6 +7209,64 @@ ], "time": "2022-08-30T07:42:16+00:00" }, + { + "name": "rector/rector", + "version": "0.14.6", + "source": { + "type": "git", + "url": "https://github.com/rectorphp/rector.git", + "reference": "e61574288661334155de6e5f0f45497285abad5d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/e61574288661334155de6e5f0f45497285abad5d", + "reference": "e61574288661334155de6e5f0f45497285abad5d", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "phpstan/phpstan": "^1.8.7" + }, + "conflict": { + "rector/rector-doctrine": "*", + "rector/rector-downgrade-php": "*", + "rector/rector-laravel": "*", + "rector/rector-php-parser": "*", + "rector/rector-phpoffice": "*", + "rector/rector-phpunit": "*", + "rector/rector-symfony": "*" + }, + "bin": [ + "bin/rector" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.14-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Instant Upgrade and Automated Refactoring of any PHP code", + "support": { + "issues": "https://github.com/rectorphp/rector/issues", + "source": "https://github.com/rectorphp/rector/tree/0.14.6" + }, + "funding": [ + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2022-10-15T22:58:22+00:00" + }, { "name": "sanmai/later", "version": "0.1.2", diff --git a/psalm.xml.dist b/psalm.xml.dist index 4e9226bdb..9664617d5 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -1,10 +1,11 @@ diff --git a/rector.php b/rector.php new file mode 100644 index 000000000..a5d4ab021 --- /dev/null +++ b/rector.php @@ -0,0 +1,23 @@ +paths([ + __DIR__ . '/src' + ]); + + // register a single rule + $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class); + + $rectorConfig->sets([ + SetList::PHP_74, + //SetList::CODE_QUALITY, + //SetList::TYPE_DECLARATION_STRICT, + //SetList::DEAD_CODE, + ]); +}; diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index a815568cb..e8a8a1273 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -29,7 +29,7 @@ class CommandExecutor implements CommandExecutorInterface /** * @var array */ - protected $lastOutput; + protected $lastOutput = []; /** * @var string @@ -60,7 +60,7 @@ class CommandExecutor implements CommandExecutorInterface * * @var array */ - private static $noExitCommands = [ + private static array $noExitCommands = [ 'codecept', ]; @@ -69,7 +69,7 @@ class CommandExecutor implements CommandExecutorInterface * * @var array */ - private static $blacklistEnvVars = [ + private static array $blacklistEnvVars = [ 'PHP_SELF', 'SCRIPT_NAME', 'SCRIPT_FILENAME', @@ -86,7 +86,6 @@ public function __construct(BuildLogger $logger, $rootDir, $verbose = false) { $this->logger = $logger; $this->verbose = $verbose; - $this->lastOutput = []; $this->rootDir = $rootDir; } @@ -136,9 +135,7 @@ public function executeCommand($args = []) \exec("ps auxww | grep '{$withNoExit}' | grep -v grep", $response); $response = \array_filter( $response, - function ($a) { - return \strpos($a, $this->buildPath) !== false; - } + fn($a) => \strpos($a, $this->buildPath) !== false ); } while (!empty($response)); $process->stop(); diff --git a/src/Plugin/Behat.php b/src/Plugin/Behat.php index 710a2802b..bfff90a48 100644 --- a/src/Plugin/Behat.php +++ b/src/Plugin/Behat.php @@ -21,7 +21,7 @@ class Behat extends Plugin /** * @var string */ - protected $features; + protected $features = ''; /** * @return string @@ -40,8 +40,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->executable = $this->findBinary(['behat', 'behat.phar']); - $this->features = ''; - if (!empty($options['features'])) { $this->features = $options['features']; } diff --git a/src/Plugin/BitbucketNotify.php b/src/Plugin/BitbucketNotify.php index ba56850f1..ff0edc52a 100644 --- a/src/Plugin/BitbucketNotify.php +++ b/src/Plugin/BitbucketNotify.php @@ -269,7 +269,7 @@ protected function prepareResult($targetBranch) return []; } - $plugins = \array_unique(\array_merge(\array_keys($targetBranchBuildStats), \array_keys($currentBranchBuildStats))); + $plugins = \array_unique([...\array_keys($targetBranchBuildStats), ...\array_keys($currentBranchBuildStats)]); \sort($plugins); $result = []; diff --git a/src/Plugin/CampfireNotify.php b/src/Plugin/CampfireNotify.php index 7645ee25b..12fca94a3 100644 --- a/src/Plugin/CampfireNotify.php +++ b/src/Plugin/CampfireNotify.php @@ -21,7 +21,7 @@ class CampfireNotify extends Plugin protected $url; protected $authToken; protected $userAgent; - protected $cookie; + protected $cookie = 'php-censor-cookie'; protected $verbose = false; protected $room; protected $message; @@ -44,7 +44,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) $this->message = $options['message']; $version = $this->builder->interpolate('%SYSTEM_VERSION%'); $this->userAgent = 'PHP Censor/' . $version; - $this->cookie = "php-censor-cookie"; if (isset($options['verbose']) && $options['verbose']) { $this->verbose = true; diff --git a/src/Plugin/Composer.php b/src/Plugin/Composer.php index 74363ef85..97852eceb 100644 --- a/src/Plugin/Composer.php +++ b/src/Plugin/Composer.php @@ -19,11 +19,11 @@ */ class Composer extends Plugin implements ZeroConfigPluginInterface { - protected $action; - protected $preferDist; - protected $noDev; - protected $ignorePlatformReqs; - protected $preferSource; + protected $action = 'install'; + protected $preferDist = false; + protected $noDev = false; + protected $ignorePlatformReqs = false; + protected $preferSource = false; /** * @return string @@ -40,12 +40,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->action = 'install'; - $this->preferDist = false; - $this->preferSource = false; - $this->noDev = false; - $this->ignorePlatformReqs = false; - $this->executable = $this->findBinary(['composer', 'composer.phar']); if (\array_key_exists('action', $options)) { diff --git a/src/Plugin/Deployer.php b/src/Plugin/Deployer.php index 71bcb377e..742ad89fa 100644 --- a/src/Plugin/Deployer.php +++ b/src/Plugin/Deployer.php @@ -19,7 +19,7 @@ class Deployer extends Plugin { protected $webhookUrl; - protected $reason; + protected $reason = 'PHP Censor Build #%BUILD_ID% - %COMMIT_MESSAGE%'; protected $updateOnly; /** @@ -37,7 +37,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->reason = 'PHP Censor Build #%BUILD_ID% - %COMMIT_MESSAGE%'; if (isset($options['webhook_url'])) { $this->webhookUrl = $options['webhook_url']; } diff --git a/src/Plugin/Grunt.php b/src/Plugin/Grunt.php index 7069c06ae..0d49bac7d 100644 --- a/src/Plugin/Grunt.php +++ b/src/Plugin/Grunt.php @@ -17,8 +17,8 @@ */ class Grunt extends Plugin { - protected $task; - protected $gruntfile; + protected $task = null; + protected $gruntfile = 'Gruntfile.js'; /** * @return string @@ -35,10 +35,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->task = null; - - $this->gruntfile = 'Gruntfile.js'; - if (isset($options['task'])) { $this->task = $options['task']; } diff --git a/src/Plugin/Gulp.php b/src/Plugin/Gulp.php index 1a33053e6..6aff9411a 100644 --- a/src/Plugin/Gulp.php +++ b/src/Plugin/Gulp.php @@ -17,8 +17,8 @@ */ class Gulp extends Plugin { - protected $task; - protected $gulpfile; + protected $task = null; + protected $gulpfile = 'gulpfile.js'; /** * @return string @@ -35,12 +35,8 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->task = null; - $this->executable = $this->findBinary('gulp'); - $this->gulpfile = 'gulpfile.js'; - if (isset($options['task'])) { $this->task = $options['task']; } diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 32668d434..2be2f1cc6 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -83,9 +83,7 @@ protected function getMageLog() throw new RuntimeException('Log dir read fail'); } - $list = \array_filter($list, function ($name) { - return \preg_match('/^log-\d+-\d+\.log$/', $name); - }); + $list = \array_filter($list, fn($name) => \preg_match('/^log-\d+-\d+\.log$/', $name)); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index df3f3c728..f3e30b165 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -88,9 +88,7 @@ protected function getMageLog() throw new RuntimeException('Log dir read fail'); } - $list = \array_filter($list, function ($name) { - return \preg_match('/^\d+_\d+\.log$/', $name); - }); + $list = \array_filter($list, fn($name) => \preg_match('/^\d+_\d+\.log$/', $name)); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } diff --git a/src/Plugin/Pdepend.php b/src/Plugin/Pdepend.php index 941dbe32c..74964c0b9 100644 --- a/src/Plugin/Pdepend.php +++ b/src/Plugin/Pdepend.php @@ -34,17 +34,17 @@ class Pdepend extends Plugin /** * @var string File where the summary.xml is stored */ - protected $summary; + protected $summary = 'summary.xml'; /** * @var string File where the chart.svg is stored */ - protected $chart; + protected $chart = 'chart.svg'; /** * @var string File where the pyramid.svg is stored */ - protected $pyramid; + protected $pyramid = 'pyramid.svg'; /** * @var string @@ -71,10 +71,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->summary = 'summary.xml'; - $this->pyramid = 'pyramid.svg'; - $this->chart = 'chart.svg'; - $this->executable = $this->findBinary(['pdepend', 'pdepend.phar']); $this->buildDirectory = $build->getBuildDirectory(); diff --git a/src/Plugin/PhpCodeSniffer.php b/src/Plugin/PhpCodeSniffer.php index c195065a7..ae6ae2051 100644 --- a/src/Plugin/PhpCodeSniffer.php +++ b/src/Plugin/PhpCodeSniffer.php @@ -25,32 +25,32 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface /** * @var array */ - protected $suffixes; + protected $suffixes = ['php']; /** * @var string */ - protected $standard; + protected $standard = 'PSR2'; /** * @var string */ - protected $tabWidth; + protected $tabWidth = ''; /** * @var string */ - protected $encoding; + protected $encoding = ''; /** * @var int */ - protected $allowedErrors; + protected $allowedErrors = 0; /** * @var int */ - protected $allowedWarnings; + protected $allowedWarnings = 0; /** * @var int @@ -82,13 +82,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->suffixes = ['php']; - $this->standard = 'PSR2'; - $this->tabWidth = ''; - $this->encoding = ''; - $this->allowedWarnings = 0; - $this->allowedErrors = 0; - $this->executable = $this->findBinary(['phpcs', 'phpcs.phar']); if (isset($options['zero_config']) && $options['zero_config']) { diff --git a/src/Plugin/PhpDocblockChecker.php b/src/Plugin/PhpDocblockChecker.php index 24ca38bfe..516a75d2c 100644 --- a/src/Plugin/PhpDocblockChecker.php +++ b/src/Plugin/PhpDocblockChecker.php @@ -26,7 +26,7 @@ class PhpDocblockChecker extends Plugin implements ZeroConfigPluginInterface /** * @var int */ - protected $allowedWarnings; + protected $allowedWarnings = 0; /** * @return string @@ -43,8 +43,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->allowedWarnings = 0; - if (isset($options['zero_config']) && $options['zero_config']) { $this->allowedWarnings = -1; } diff --git a/src/Plugin/PhpLoc.php b/src/Plugin/PhpLoc.php index 00026008e..1a817b58f 100644 --- a/src/Plugin/PhpLoc.php +++ b/src/Plugin/PhpLoc.php @@ -5,6 +5,7 @@ use PHPCensor; use PHPCensor\Builder; use PHPCensor\Model\Build; +use PHPCensor\Model\User; use PHPCensor\Plugin; use PHPCensor\ZeroConfigPluginInterface; @@ -56,9 +57,7 @@ public function execute() { $ignore = ''; if (\is_array($this->ignore)) { - $map = function ($item) { - return \sprintf(' --exclude="%s"', $item); - }; + $map = fn($item) => \sprintf(' --exclude="%s"', $item); $ignore = \array_map($map, $this->ignore); $ignore = \implode('', $ignore); diff --git a/src/Plugin/PhpMessDetector.php b/src/Plugin/PhpMessDetector.php index b6a22ea2d..46a000c25 100644 --- a/src/Plugin/PhpMessDetector.php +++ b/src/Plugin/PhpMessDetector.php @@ -24,15 +24,15 @@ class PhpMessDetector extends Plugin implements ZeroConfigPluginInterface /** * @var array */ - protected $suffixes; + protected $suffixes = ['php']; /** * Array of PHPMD rules. Can be one of the builtins (codesize, unusedcode, naming, design, controversial) * or a filename (detected by checking for a / in it), either absolute or relative to the project root. * @var array */ - protected $rules; - protected $allowedWarnings; + protected $rules = ['codesize', 'unusedcode', 'naming']; + protected $allowedWarnings = 0; /** * @return string @@ -49,10 +49,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->suffixes = ['php']; - $this->rules = ['codesize', 'unusedcode', 'naming']; - $this->allowedWarnings = 0; - if (isset($options['zero_config']) && $options['zero_config']) { $this->allowedWarnings = -1; } diff --git a/src/Plugin/PhpParallelLint.php b/src/Plugin/PhpParallelLint.php index 1d39b669b..4ec480d77 100644 --- a/src/Plugin/PhpParallelLint.php +++ b/src/Plugin/PhpParallelLint.php @@ -21,12 +21,12 @@ class PhpParallelLint extends Plugin implements ZeroConfigPluginInterface /** * @var string - comma separated list of file extensions */ - protected $extensions; + protected $extensions = 'php'; /** * @var bool - enable short tags */ - protected $shortTag; + protected $shortTag = false; /** * @return string @@ -47,9 +47,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->extensions = 'php'; - $this->shortTag = false; - $this->executable = $this->findBinary(['parallel-lint', 'parallel-lint.phar']); if (isset($options['shorttags'])) { diff --git a/src/Plugin/SecurityChecker.php b/src/Plugin/SecurityChecker.php index 2f7bf71be..53bfeebe2 100644 --- a/src/Plugin/SecurityChecker.php +++ b/src/Plugin/SecurityChecker.php @@ -23,7 +23,7 @@ class SecurityChecker extends Plugin implements ZeroConfigPluginInterface /** * @var int */ - protected $allowedWarnings; + protected $allowedWarnings = 0; /** * @var string @@ -53,8 +53,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->allowedWarnings = 0; - if (isset($options['zero_config']) && $options['zero_config']) { $this->allowedWarnings = -1; } diff --git a/src/Plugin/SensiolabsInsight.php b/src/Plugin/SensiolabsInsight.php index 6477bacdb..fc6387426 100644 --- a/src/Plugin/SensiolabsInsight.php +++ b/src/Plugin/SensiolabsInsight.php @@ -38,7 +38,7 @@ class SensiolabsInsight extends Plugin /** * @var int */ - protected $allowedWarnings; + protected $allowedWarnings = 0; /** * @return string @@ -54,8 +54,6 @@ public static function pluginName() public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - - $this->allowedWarnings = 0; if (\array_key_exists('allowed_warnings', $options)) { $this->allowedWarnings = (int)$options['allowed_warnings']; } diff --git a/src/Plugin/TechnicalDebt.php b/src/Plugin/TechnicalDebt.php index 347e77994..8c19f77ec 100644 --- a/src/Plugin/TechnicalDebt.php +++ b/src/Plugin/TechnicalDebt.php @@ -25,17 +25,17 @@ class TechnicalDebt extends Plugin implements ZeroConfigPluginInterface /** * @var array */ - protected $suffixes; + protected $suffixes = ['php']; /** * @var int */ - protected $allowedErrors; + protected $allowedErrors = 0; /** * @var array - terms to search for */ - protected $searches; + protected $searches = ['TODO', 'FIXME', 'TO DO', 'FIX ME']; /** * @var array - lines of . and X to visualize errors @@ -117,10 +117,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->suffixes = ['php']; - $this->allowedErrors = 0; - $this->searches = ['TODO', 'FIXME', 'TO DO', 'FIX ME']; - if (!empty($options['suffixes']) && \is_array($options['suffixes'])) { $this->suffixes = $options['suffixes']; } diff --git a/src/Plugin/Util/BitbucketNotifyPluginResult.php b/src/Plugin/Util/BitbucketNotifyPluginResult.php index a7dda97b0..8157dcdb6 100644 --- a/src/Plugin/Util/BitbucketNotifyPluginResult.php +++ b/src/Plugin/Util/BitbucketNotifyPluginResult.php @@ -22,14 +22,13 @@ class BitbucketNotifyPluginResult protected $right; /** @var string $outputFormat */ - protected $outputFormat; + protected $outputFormat = self::DEFAULT_PLUGIN_OUTPUT_FORMAT; public function __construct($plugin, $left, $right) { $this->plugin = $plugin; $this->left = $left; $this->right = $right; - $this->outputFormat = self::DEFAULT_PLUGIN_OUTPUT_FORMAT; } public function getPlugin() diff --git a/src/Plugin/Util/PhpUnitResult.php b/src/Plugin/Util/PhpUnitResult.php index ac10f74bb..e90788cb8 100644 --- a/src/Plugin/Util/PhpUnitResult.php +++ b/src/Plugin/Util/PhpUnitResult.php @@ -42,17 +42,17 @@ public function __construct($outputFile, $buildPath = '') */ abstract public function parse(); - abstract protected function getSeverity($testcase); + abstract protected function getSeverity($testCase); - abstract protected function buildMessage($testcase); + abstract protected function buildMessage($testCase); - abstract protected function buildTrace($testcase); + abstract protected function buildTrace($testCase); - abstract protected function getFileAndLine($testcase); + abstract protected function getFileAndLine($testCase); - protected function getOutput($testcase) + protected function getOutput($testCase) { - return $testcase['output']; + return $testCase['output']; } protected function parseTestcase($testcase) diff --git a/src/Plugin/Util/PhpUnitResultJson.php b/src/Plugin/Util/PhpUnitResultJson.php index b9051e1c6..da47d4088 100644 --- a/src/Plugin/Util/PhpUnitResultJson.php +++ b/src/Plugin/Util/PhpUnitResultJson.php @@ -72,21 +72,21 @@ public function parse() /** * Build the severity of the event * - * @param $event + * @param $testCase * * @return string The severity flags * @throws Exception */ - protected function getSeverity($event) + protected function getSeverity($testCase) { - $status = $event['status']; + $status = $testCase['status']; switch ($status) { case 'fail': $severity = self::SEVERITY_FAIL; break; case 'error': - if (\strpos($event['message'], 'Skipped') === 0 || \strpos($event['message'], 'Incomplete') === 0) { + if (\strpos($testCase['message'], 'Skipped') === 0 || \strpos($testCase['message'], 'Incomplete') === 0) { $severity = self::SEVERITY_SKIPPED; } else { $severity = self::SEVERITY_ERROR; @@ -108,16 +108,16 @@ protected function getSeverity($event) /** * Build the message string for an event * - * @param array $event + * @param array $testCase * * @return string */ - protected function buildMessage($event) + protected function buildMessage($testCase) { - $message = $event['test']; + $message = $testCase['test']; - if ($event['message']) { - $message .= PHP_EOL . $event ['message']; + if ($testCase['message']) { + $message .= PHP_EOL . $testCase ['message']; } return $message; @@ -126,16 +126,16 @@ protected function buildMessage($event) /** * Build a string base trace of the failure * - * @param array $event + * @param array $testCase * * @return string[] */ - protected function buildTrace($event) + protected function buildTrace($testCase) { $formattedTrace = []; - if (!empty($event['trace'])) { - foreach ($event['trace'] as $step) { + if (!empty($testCase['trace'])) { + foreach ($testCase['trace'] as $step) { $line = \str_replace($this->buildPath, '', $step['file']) . ':' . $step['line']; $formattedTrace[] = $line; } @@ -147,20 +147,20 @@ protected function buildTrace($event) /** * Saves additional info for a failing test * - * @param array $event + * @param array $testCase * * @return array */ - protected function getFileAndLine($event) + protected function getFileAndLine($testCase) { - if (empty($event['trace'])) { + if (empty($testCase['trace'])) { return [ 'file' => '', 'line' => '', ]; } - $firstTrace = \end($event['trace']); - \reset($event['trace']); + $firstTrace = \end($testCase['trace']); + \reset($testCase['trace']); return [ 'file' => \str_replace($this->buildPath, '', $firstTrace['file']), diff --git a/src/Plugin/Util/PhpUnitResultJunit.php b/src/Plugin/Util/PhpUnitResultJunit.php index 1cbac12a7..003ad5874 100644 --- a/src/Plugin/Util/PhpUnitResultJunit.php +++ b/src/Plugin/Util/PhpUnitResultJunit.php @@ -167,9 +167,9 @@ private function internalProblem($description) throw new RuntimeException($description); } - protected function getFileAndLine($testcase) + protected function getFileAndLine($testCase) { - $attributes = $testcase->attributes(); + $attributes = $testCase->attributes(); return [ 'file' => \str_replace($this->buildPath, '', $attributes['file']), diff --git a/src/Plugin/WebhookNotify.php b/src/Plugin/WebhookNotify.php index 3a19d5da6..eb0e7a0fe 100644 --- a/src/Plugin/WebhookNotify.php +++ b/src/Plugin/WebhookNotify.php @@ -25,7 +25,7 @@ class WebhookNotify extends Plugin /** * @var string The URL to send the webhook to. */ - private $url; + private string $url; /** * @return string diff --git a/src/Plugin/XmppNotify.php b/src/Plugin/XmppNotify.php index 49df480f8..f65ba8b15 100644 --- a/src/Plugin/XmppNotify.php +++ b/src/Plugin/XmppNotify.php @@ -20,37 +20,37 @@ class XmppNotify extends Plugin /** * @var string, username of sender account xmpp */ - protected $username; + protected $username = ''; /** * @var string, alias server of sender account xmpp */ - protected $server; + protected $server = ''; /** * @var string, password of sender account xmpp */ - protected $password; + protected $password = ''; /** * @var string, alias for sender */ - protected $alias; + protected $alias = ''; /** * @var string, use tls */ - protected $tls; + protected $tls = false; /** * @var array, list of recipients xmpp accounts */ - protected $recipients; + protected $recipients = []; /** * @var string, mask to format date */ - protected $dateFormat; + protected $dateFormat = '%c'; /** * @return string @@ -67,14 +67,6 @@ public function __construct(Builder $builder, Build $build, array $options = []) { parent::__construct($builder, $build, $options); - $this->username = ''; - $this->password = ''; - $this->server = ''; - $this->alias = ''; - $this->recipients = []; - $this->tls = false; - $this->dateFormat = '%c'; - $this->executable = $this->findBinary('sendxmpp'); /* diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index d71f15e24..b27749003 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -8,6 +8,7 @@ use PDO; use PHPCensor\Exception\HttpException; use PHPCensor\Model\BuildError; +use PHPCensor\Model\BuildMeta; use PHPCensor\Store; /** @@ -73,9 +74,7 @@ public function getByBuildId(int $buildId, ?int $limit = null, int $offset = 0, if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new BuildError($this->storeRegistry, $item); - }; + $map = fn($item) => new BuildError($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -152,10 +151,7 @@ public function getKnownPlugins(int $buildId, ?int $severity = null, ?string $is if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return $item['plugin']; - }; + $map = fn($item) => $item['plugin']; return \array_map($map, $res); } else { @@ -185,10 +181,7 @@ public function getKnownSeverities(int $buildId, ?string $plugin = null, ?string if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return (int)$item['severity']; - }; + $map = fn($item) => (int)$item['severity']; return \array_map($map, $res); } else { diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 0a240eeb1..6fa6da202 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -6,6 +6,8 @@ use PDO; use PHPCensor\Exception\HttpException; +use PHPCensor\Model\Build; +use PHPCensor\Model\BuildError; use PHPCensor\Model\BuildMeta; use PHPCensor\Store; @@ -68,9 +70,7 @@ public function getByBuildId(int $buildId, int $limit = 1000, string $useConnect if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new BuildMeta($this->storeRegistry, $item); - }; + $map = fn($item) => new BuildMeta($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -96,10 +96,7 @@ public function getErrorsForUpgrade(int $limit): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return new BuildMeta($this->storeRegistry, $item); - }; + $map = fn($item) => new BuildMeta($this->storeRegistry, $item); return \array_map($map, $res); } else { diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 929f39e46..1ade97bda 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -44,9 +44,7 @@ public function getByProjectId(int $projectId, int $limit = 1000, string $useCon if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -76,9 +74,7 @@ public function getByStatus(int $status, int $limit = 1000, string $useConnectio if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -99,10 +95,7 @@ public function getBuilds(int $limit = 5, int $offset = 0): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); return \array_map($map, $res); } else { @@ -151,10 +144,7 @@ public function getLatestBuilds(?int $projectId = null, int $limit = 5): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); return \array_map($map, $res); } else { @@ -253,9 +243,7 @@ public function getAllProjectsLatestBuilds(int $limitByProject = 5, int $limitAl } foreach ($projects as $idx => $project) { - $projects[$idx] = \array_filter($project, function ($val) { - return ($val['latest'][0]->getStatus() !== Build::STATUS_SUCCESS); - }); + $projects[$idx] = \array_filter($project, fn($val) => $val['latest'][0]->getStatus() !== Build::STATUS_SUCCESS); } $projects = \array_filter($projects); @@ -279,10 +267,7 @@ public function getByProjectAndCommit(int $projectId, string $commitId): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); @@ -424,10 +409,7 @@ public function getOldByProject(int $projectId, int $keep = 100): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Build($this->storeRegistry, $item); - }; + $map = fn($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index a0ffe27a7..23484dc78 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -7,6 +7,7 @@ use Exception; use PDO; use PHPCensor\Exception\HttpException; +use PHPCensor\Model\Build; use PHPCensor\Model\Environment; use PHPCensor\Store; @@ -66,9 +67,7 @@ public function getByProjectId(int $projectId, string $useConnection = 'read'): if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Environment($this->storeRegistry, $item); - }; + $map = fn($item) => new Environment($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 84e199bfb..13cbb885a 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -7,6 +7,7 @@ use Exception; use PDO; use PHPCensor\Exception\HttpException; +use PHPCensor\Model\Environment; use PHPCensor\Model\Project; use PHPCensor\Store; @@ -70,9 +71,7 @@ public function getByTitle(string $title, int $limit = 1000, string $useConnecti if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Project($this->storeRegistry, $item); - }; + $map = fn($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -97,9 +96,7 @@ public function getKnownBranches(int $projectId): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return $item['branch']; - }; + $map = fn($item) => $item['branch']; return \array_map($map, $res); } else { @@ -122,9 +119,7 @@ public function getAll(string $useConnection = 'read', bool $archived = false): if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Project($this->storeRegistry, $item); - }; + $map = fn($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -158,9 +153,7 @@ public function getByGroupId(int $groupId, bool $archived = false, int $limit = if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new Project($this->storeRegistry, $item); - }; + $map = fn($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index 74980b6b4..eb4b0a38a 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -114,9 +114,7 @@ public function getByName(string $name, int $limit = 1000, string $useConnection if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = function ($item) { - return new User($this->storeRegistry, $item); - }; + $map = fn($item) => new User($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Worker/BuildWorker.php b/src/Worker/BuildWorker.php index 21f22a0ef..21c11b91b 100644 --- a/src/Worker/BuildWorker.php +++ b/src/Worker/BuildWorker.php @@ -63,7 +63,7 @@ class BuildWorker private Pheanstalk $pheanstalk; - private int $lastPeriodical; + private int $lastPeriodical = 0; public function __construct( ConfigurationInterface $configuration, @@ -87,7 +87,6 @@ public function __construct( $this->queueTube = $queueTube; $this->pheanstalk = Pheanstalk::create($queueHost, $queuePort); - $this->lastPeriodical = 0; $this->canPeriodicalWork = $canPeriodicalWork; } From 5818fa87779274efc5fbf5824d01135f97ab59b5 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 17 Nov 2022 22:58:46 +0700 Subject: [PATCH 180/212] Code style fixes. --- src/Helper/CommandExecutor.php | 6 +----- src/Plugin/Mage.php | 2 +- src/Plugin/Mage3.php | 2 +- src/Plugin/PhpLoc.php | 2 +- src/Store/BuildErrorStore.php | 6 +++--- src/Store/BuildMetaStore.php | 4 ++-- src/Store/BuildStore.php | 14 +++++++------- src/Store/EnvironmentStore.php | 2 +- src/Store/ProjectStore.php | 8 ++++---- src/Store/UserStore.php | 2 +- 10 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index e8a8a1273..cac36a7fe 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -57,8 +57,6 @@ class CommandExecutor implements CommandExecutorInterface /** * Commands with no proper exit mechanism - * - * @var array */ private static array $noExitCommands = [ 'codecept', @@ -66,8 +64,6 @@ class CommandExecutor implements CommandExecutorInterface /** * Environment variables that should not be inherited - * - * @var array */ private static array $blacklistEnvVars = [ 'PHP_SELF', @@ -135,7 +131,7 @@ public function executeCommand($args = []) \exec("ps auxww | grep '{$withNoExit}' | grep -v grep", $response); $response = \array_filter( $response, - fn($a) => \strpos($a, $this->buildPath) !== false + fn ($a) => \strpos($a, $this->buildPath) !== false ); } while (!empty($response)); $process->stop(); diff --git a/src/Plugin/Mage.php b/src/Plugin/Mage.php index 2be2f1cc6..c276703b8 100644 --- a/src/Plugin/Mage.php +++ b/src/Plugin/Mage.php @@ -83,7 +83,7 @@ protected function getMageLog() throw new RuntimeException('Log dir read fail'); } - $list = \array_filter($list, fn($name) => \preg_match('/^log-\d+-\d+\.log$/', $name)); + $list = \array_filter($list, fn ($name) => \preg_match('/^log-\d+-\d+\.log$/', $name)); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } diff --git a/src/Plugin/Mage3.php b/src/Plugin/Mage3.php index f3e30b165..c60ab9f47 100644 --- a/src/Plugin/Mage3.php +++ b/src/Plugin/Mage3.php @@ -88,7 +88,7 @@ protected function getMageLog() throw new RuntimeException('Log dir read fail'); } - $list = \array_filter($list, fn($name) => \preg_match('/^\d+_\d+\.log$/', $name)); + $list = \array_filter($list, fn ($name) => \preg_match('/^\d+_\d+\.log$/', $name)); if (empty($list)) { throw new RuntimeException('Log dir filter fail'); } diff --git a/src/Plugin/PhpLoc.php b/src/Plugin/PhpLoc.php index 1a817b58f..0529cc3bf 100644 --- a/src/Plugin/PhpLoc.php +++ b/src/Plugin/PhpLoc.php @@ -57,7 +57,7 @@ public function execute() { $ignore = ''; if (\is_array($this->ignore)) { - $map = fn($item) => \sprintf(' --exclude="%s"', $item); + $map = fn ($item) => \sprintf(' --exclude="%s"', $item); $ignore = \array_map($map, $this->ignore); $ignore = \implode('', $ignore); diff --git a/src/Store/BuildErrorStore.php b/src/Store/BuildErrorStore.php index b27749003..b40894faf 100644 --- a/src/Store/BuildErrorStore.php +++ b/src/Store/BuildErrorStore.php @@ -74,7 +74,7 @@ public function getByBuildId(int $buildId, ?int $limit = null, int $offset = 0, if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new BuildError($this->storeRegistry, $item); + $map = fn ($item) => new BuildError($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -151,7 +151,7 @@ public function getKnownPlugins(int $buildId, ?int $severity = null, ?string $is if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => $item['plugin']; + $map = fn ($item) => $item['plugin']; return \array_map($map, $res); } else { @@ -181,7 +181,7 @@ public function getKnownSeverities(int $buildId, ?string $plugin = null, ?string if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => (int)$item['severity']; + $map = fn ($item) => (int)$item['severity']; return \array_map($map, $res); } else { diff --git a/src/Store/BuildMetaStore.php b/src/Store/BuildMetaStore.php index 6fa6da202..ff358c705 100644 --- a/src/Store/BuildMetaStore.php +++ b/src/Store/BuildMetaStore.php @@ -70,7 +70,7 @@ public function getByBuildId(int $buildId, int $limit = 1000, string $useConnect if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new BuildMeta($this->storeRegistry, $item); + $map = fn ($item) => new BuildMeta($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -96,7 +96,7 @@ public function getErrorsForUpgrade(int $limit): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new BuildMeta($this->storeRegistry, $item); + $map = fn ($item) => new BuildMeta($this->storeRegistry, $item); return \array_map($map, $res); } else { diff --git a/src/Store/BuildStore.php b/src/Store/BuildStore.php index 1ade97bda..98fd7b814 100644 --- a/src/Store/BuildStore.php +++ b/src/Store/BuildStore.php @@ -44,7 +44,7 @@ public function getByProjectId(int $projectId, int $limit = 1000, string $useCon if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -74,7 +74,7 @@ public function getByStatus(int $status, int $limit = 1000, string $useConnectio if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -95,7 +95,7 @@ public function getBuilds(int $limit = 5, int $offset = 0): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); return \array_map($map, $res); } else { @@ -144,7 +144,7 @@ public function getLatestBuilds(?int $projectId = null, int $limit = 5): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); return \array_map($map, $res); } else { @@ -243,7 +243,7 @@ public function getAllProjectsLatestBuilds(int $limitByProject = 5, int $limitAl } foreach ($projects as $idx => $project) { - $projects[$idx] = \array_filter($project, fn($val) => $val['latest'][0]->getStatus() !== Build::STATUS_SUCCESS); + $projects[$idx] = \array_filter($project, fn ($val) => $val['latest'][0]->getStatus() !== Build::STATUS_SUCCESS); } $projects = \array_filter($projects); @@ -267,7 +267,7 @@ public function getByProjectAndCommit(int $projectId, string $commitId): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); @@ -409,7 +409,7 @@ public function getOldByProject(int $projectId, int $keep = 100): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Build($this->storeRegistry, $item); + $map = fn ($item) => new Build($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/EnvironmentStore.php b/src/Store/EnvironmentStore.php index 23484dc78..01c6192b0 100644 --- a/src/Store/EnvironmentStore.php +++ b/src/Store/EnvironmentStore.php @@ -67,7 +67,7 @@ public function getByProjectId(int $projectId, string $useConnection = 'read'): if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Environment($this->storeRegistry, $item); + $map = fn ($item) => new Environment($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/ProjectStore.php b/src/Store/ProjectStore.php index 13cbb885a..f9151207d 100644 --- a/src/Store/ProjectStore.php +++ b/src/Store/ProjectStore.php @@ -71,7 +71,7 @@ public function getByTitle(string $title, int $limit = 1000, string $useConnecti if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Project($this->storeRegistry, $item); + $map = fn ($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -96,7 +96,7 @@ public function getKnownBranches(int $projectId): array if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => $item['branch']; + $map = fn ($item) => $item['branch']; return \array_map($map, $res); } else { @@ -119,7 +119,7 @@ public function getAll(string $useConnection = 'read', bool $archived = false): if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Project($this->storeRegistry, $item); + $map = fn ($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); @@ -153,7 +153,7 @@ public function getByGroupId(int $groupId, bool $archived = false, int $limit = if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new Project($this->storeRegistry, $item); + $map = fn ($item) => new Project($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); diff --git a/src/Store/UserStore.php b/src/Store/UserStore.php index eb4b0a38a..fb0ad4a33 100644 --- a/src/Store/UserStore.php +++ b/src/Store/UserStore.php @@ -114,7 +114,7 @@ public function getByName(string $name, int $limit = 1000, string $useConnection if ($stmt->execute()) { $res = $stmt->fetchAll(PDO::FETCH_ASSOC); - $map = fn($item) => new User($this->storeRegistry, $item); + $map = fn ($item) => new User($this->storeRegistry, $item); $rtn = \array_map($map, $res); $count = \count($rtn); From 57c84c5fd8b6c63c6162d563635c8a942f9ed162 Mon Sep 17 00:00:00 2001 From: Pavel Starosek Date: Wed, 7 Dec 2022 02:30:38 +0600 Subject: [PATCH 181/212] PHP 8.1 deprecation while searching for composer binary --- src/Helper/CommandExecutor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Helper/CommandExecutor.php b/src/Helper/CommandExecutor.php index cac36a7fe..b240a27ef 100644 --- a/src/Helper/CommandExecutor.php +++ b/src/Helper/CommandExecutor.php @@ -295,7 +295,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ return $existedBinary; } - if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) { + if (null !== $composerBin && $existedBinary = $this->findBinaryLocal($composerBin, $bin)) { return $existedBinary; } @@ -311,7 +311,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ return $existedBinary; } - if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) { + if (null !== $composerBin && $existedBinary = $this->findBinaryLocal($composerBin, $bin)) { return $existedBinary; } @@ -327,7 +327,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ return $existedBinary; } - if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) { + if (null !== $composerBin && $existedBinary = $this->findBinaryLocal($composerBin, $bin)) { return $existedBinary; } @@ -339,7 +339,7 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $ return $existedBinary; } } else { - if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) { + if (null !== $composerBin && $existedBinary = $this->findBinaryLocal($composerBin, $bin)) { return $existedBinary; } From 2bf42edad3a499493631da4a0044101191eeac34 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 9 Dec 2022 22:34:03 +0700 Subject: [PATCH 182/212] Fixed .php-censor.yml config +. --- .php-censor.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.php-censor.yml b/.php-censor.yml index 5895258eb..d111b9e00 100644 --- a/.php-censor.yml +++ b/.php-censor.yml @@ -10,10 +10,15 @@ setup: SKIP_DB_TESTS: '0' POSTGRESQL_USER: '%SECRET:postgres_testdb_user%' POSTGRESQL_PASSWORD: '%SECRET:postgres_testdb_password%' - POSTGRESQL_DBNAME: '%SECRET:postgres_testdb_name%' + POSTGRESQL_DBNAME: '%SECRET:postgres_testdb_name%_%BUILD_ID%' MYSQL_USER: '%SECRET:mysql_testdb_user%' MYSQL_PASSWORD: '%SECRET:mysql_testdb_password%' - MYSQL_DBNAME: '%SECRET:mysql_testdb_name%' + MYSQL_DBNAME: '%SECRET:mysql_testdb_name%_%BUILD_ID%' + shell: + execute_all: true + commands: + - "cd ~ && ./create_test_ci_mysql_db.sh %BUILD_ID%" + - "cd ~ && ./create_test_ci_postgres_db.sh %BUILD_ID%" test: php_unit: @@ -44,6 +49,10 @@ test: allow_failures: false complete: + shell: + commands: + - "cd ~ && ./drop_test_ci_mysql_db.sh %BUILD_ID%" + - "cd ~ && ./drop_test_ci_postgres_db.sh %BUILD_ID%" email_notify: default_mailto_address: poisoncorpsee@gmail.com telegram_notify: From 8076e8204b3b2533b97ea499545177500952b0a3 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 11 Jan 2023 21:56:30 +0700 Subject: [PATCH 183/212] Updated changelog for 2.0. --- docs/CHANGELOG_2.0.md | 51 ++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/docs/CHANGELOG_2.0.md b/docs/CHANGELOG_2.0.md index ebf010d16..c036c8ae6 100644 --- a/docs/CHANGELOG_2.0.md +++ b/docs/CHANGELOG_2.0.md @@ -1,10 +1,21 @@ Changelog 2.0 ============= -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.11 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.11) (2023-01-11) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.0.11) + +### Fixed + +- PHP 8.1 deprecation while searching for composer binary. Pull request [#434](https://github.com/php-censor/php-censor/pull/434). + Thanks to [@StudioMaX](https://github.com/StudioMaX). +- PHP 8.1 error with return type of `php_user_filter::filter` function. + + ## [2.0.10 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.10) (2022-06-26) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.9...2.0.10) @@ -24,9 +35,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed - Updated dependencies. Fixed: - - `guzzlehttp/guzzle` (6.5.6) | CVE-2022-31042: Failure to strip the Cookie header on change in host or HTTP downgrade | https://github.com/guzzle/guzzle/security/advisories/GHSA-f2wf-25xc-69c9 + - `guzzlehttp/guzzle` (6.5.6) | CVE-2022-31042: Failure to strip the Cookie header on change in host or HTTP downgrade | https://github.com/guzzle/guzzle/security/advisories/GHSA-f2wf-25xc-69c9 - - `guzzlehttp/guzzle` (6.5.6) | CVE-2022-31043: Fix failure to strip Authorization header on HTTP downgrade | https://github.com/guzzle/guzzle/security/advisories/GHSA-w248-ffj2-4v5q + - `guzzlehttp/guzzle` (6.5.6) | CVE-2022-31043: Fix failure to strip Authorization header on HTTP downgrade | https://github.com/guzzle/guzzle/security/advisories/GHSA-w248-ffj2-4v5q ### Changed @@ -40,9 +51,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed - Updated dependencies. Fixed: - - `guzzlehttp/guzzle` (6.5.5) | CVE-2022-29248: Cross-domain cookie leakage | https://github.com/guzzle/guzzle/security/advisories/GHSA-cwmx-hcrq-mhc3. + - `guzzlehttp/guzzle` (6.5.5) | CVE-2022-29248: Cross-domain cookie leakage | https://github.com/guzzle/guzzle/security/advisories/GHSA-cwmx-hcrq-mhc3. - - `guzzlehttp/psr7` (1.8.3) | CVE-2022-24775: Inproper parsing of HTTP headers | https://github.com/guzzle/psr7/security/advisories/GHSA-q7rv-6hp3-vh96. + - `guzzlehttp/psr7` (1.8.3) | CVE-2022-24775: Inproper parsing of HTTP headers | https://github.com/guzzle/psr7/security/advisories/GHSA-q7rv-6hp3-vh96. ## [2.0.7 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.7) (2022-01-19) @@ -92,9 +103,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed -- **[PhpStan]** Option `directories` and `directory`. -Issue [#408](https://github.com/php-censor/php-censor/issues/#408). Pull request -[#409](https://github.com/php-censor/php-censor/pull/409). Thanks to [@StudioMaX](https://github.com/StudioMaX). +- **[PhpStan]** Option `directories` and `directory`. + Issue [#408](https://github.com/php-censor/php-censor/issues/#408). Pull request + [#409](https://github.com/php-censor/php-censor/pull/409). Thanks to [@StudioMaX](https://github.com/StudioMaX). - **[SecurityChecker]** Option `allowed_warnings`. - Security issue with old Chart.js version (Chart.js upgraded from version `1.1.1` to `3.3.0`). @@ -117,17 +128,17 @@ Issue [#408](https://github.com/php-censor/php-censor/issues/#408). Pull request - SSH keys generating (Removed unwanted symbols). Issue [#403](https://github.com/php-censor/php-censor/issues/#403). - Environments (Case when you may get environment from another project). Issue -[#405](https://github.com/php-censor/php-censor/issues/#405). + [#405](https://github.com/php-censor/php-censor/issues/#405). - Localizations for "Notify" plugins. -- Deprecations from PHP 8.0. Pull request [#404](https://github.com/php-censor/php-censor/pull/404). Thanks to -[@ismaail](https://github.com/ismaail). +- Deprecations from PHP 8.0. Pull request [#404](https://github.com/php-censor/php-censor/pull/404). Thanks to + [@ismaail](https://github.com/ismaail). ### Changed - **[SecurityChecker]** Reimplement the plugin because package `sensiolabs/security-checker` was archived/abandoned -(See [README](https://github.com/sensiolabs/security-checker#sensiolabs-security-checker)). Now plugin uses `symfony` -binary (Symfony CLI) or `fabpot/local-php-security-checker` tool for working. See -[documentation](https://github.com/php-censor/php-censor/blob/release-1.3/docs/en/plugins/security_checker.md). + (See [README](https://github.com/sensiolabs/security-checker#sensiolabs-security-checker)). Now plugin uses `symfony` + binary (Symfony CLI) or `fabpot/local-php-security-checker` tool for working. See + [documentation](https://github.com/php-censor/php-censor/blob/release-1.3/docs/en/plugins/security_checker.md). ### Removed @@ -155,7 +166,7 @@ binary (Symfony CLI) or `fabpot/local-php-security-checker` tool for working. Se [Full Changelog](https://github.com/php-censor/php-censor/compare/1.3.0...2.0.0) -### [How to upgrade from v1 to v2](/docs/UPGRADE_2.0.md) +### [How tp upgrade from v1 to v2](/docs/UPGRADE_2.0.md) ### Changed @@ -168,11 +179,11 @@ binary (Symfony CLI) or `fabpot/local-php-security-checker` tool for working. Se - Project configs `phpci.yml` and `.phpci.yml` (use `.php-censor.yml` instead). - `PHPCI_*` interpolation and env variables (Use `PHP_CENSOR_*` instead). - Global application config section `b8.database` (Use `php-censor.database` instead). - - Options `authToken`, `api_key`, `api_token`, `token` for several plugins: `CampfireNotify`, -`HipchatNotify`, `FlowdockNotify`, `TelegramNotify`, `SensiolabInsight`, `BitbucketNotify` (Use `auth_token` instead). - - Plugin names: `campfire`, `telegram`, `xmpp`, `email`, `irc`, `phpstan` (Use: `campfire_notify`, `telegram_notify`, -`xmpp_notify`, `email_notify`, `irc_notify`, `php_stan` instead). - - [Codeception] Option `path` (Use option `output_path` instead). + - Options `authToken`, `api_key`, `api_token`, `token` for several plugins: `CampfireNotify`, + `HipchatNotify`, `FlowdockNotify`, `TelegramNotify`, `SensiolabInsight`, `BitbucketNotify` (Use `auth_token` instead). + - Plugin names: `campfire`, `telegram`, `xmpp`, `email`, `irc`, `phpstan` (Use: `campfire_notify`, `telegram_notify`, + `xmpp_notify`, `email_notify`, `irc_notify`, `php_stan` instead). + - [Codeception] Option `path` (Use option `output_path` instead). - [Codeception] Option `executable` (Use the options `binary_path` and `binary_name` instead). - [Grunt] Option `grunt` (Use options `binary_path` and `binary_name` instead). - [Gulp] Option `gulp` (Use options `binary_path` and `binary_name` instead). From 3d0b85ef2a8a2a5e9779bab0d9a2ae8eabb12357 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 11 Jan 2023 22:02:12 +0700 Subject: [PATCH 184/212] Fixed changelog. --- CHANGELOG.md | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d23ad161..d30739c6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,50 +75,3 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a - [1.2 Changelog](/docs/CHANGELOG_1.2.md) - [1.3 Changelog](/docs/CHANGELOG_1.3.md) - [2.0 Changelog](/docs/CHANGELOG_2.0.md) -Changelog 2.1 -## [2.1.2 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.2) (2022-09-01) -[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.1...2.1.2) -- Build logger expression. Pull requests [#431](https://github.com/php-censor/php-censor/pull/431). Thanks to [@StudioMaX](https://github.com/StudioMaX). -- Type of GET param `commitId` in WebhookController. Issue [#432](https://github.com/php-censor/php-censor/pull/432). -- Webhook response type. Issue [#432](https://github.com/php-censor/php-censor/pull/432). -- Secrets security: denied to using secrets in notify plugins content. -## [2.1.1 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.1) (2022-08-30) -[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.0...2.1.1) -- `php-censor/common` package version. -- Logging with secret variables (Now secrets hides from log). -- Secrets validation. - - -## [2.1.0 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.0) (2022-08-18) - -[Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.1.0) - -### Added - -- Secrets storage with UI and secret variables in build interpolation (you can use it like `%SECRET:secret_name%`. See [documentation](https://github.com/php-censor/php-censor/blob/master/docs/en/interpolation.md)). Issue [#14](https://github.com/php-censor/php-censor/issues/#14). -- Optional logging into database webhook requests payloads (option `php-censor.webhook.log_requests`). Issue [#384](https://github.com/php-censor/php-censor/issues/#384). -- Steps inside stages (`test`, `deploy` etc.) which allow to have several same plugins into one stage. Issue [#91](https://github.com/php-censor/php-censor/issues/#91). Pull request [#417](https://github.com/php-censor/php-censor/pull/417). Thanks to [@KieranFYI](https://github.com/KieranFYI). Usage example: - ```yml - setup: # <--- stage - setup_env: # <--- step 1 - plugin: shell # <--- step 1 plugin name - commands: - - "php -r \"copy('.env.ci', '.env');\"" - - "php artisan key:generate" - - "chmod -R 777 storage bootstrap/cache" - migrate: # <--- step 2 - plugin: shell # <--- step 2 same plugin name - commands: - - "php artisan migrate" - ``` -- `GET`-parameter `environment` for Git webhook. Issue [#407](https://github.com/php-censor/php-censor/issues/#407). -- Cloning/coping projects ability. -- **[PHP Unit]** Coverage trand for builds in the timeline on dashboard. -- Massive refactoring: added types, dependency injection, new tests, documentation, fixed code style etc. Issue [#413](https://github.com/php-censor/php-censor/issues/#413). Pull requests [#412](https://github.com/php-censor/php-censor/pull/412), [#424](https://github.com/php-censor/php-censor/pull/424) and [#425](https://github.com/php-censor/php-censor/pull/425). Thanks to [@KieranFYI](https://github.com/KieranFYI) and [@Ooypunk](https://github.com/Ooypunk). -- Integrated `symfony/http-foundation` library as a new HTTP part of project. -- Integrate some features from `php-censor/common` library. -- Improved UI: fixed colors and ratio for `Chart.js` charts, added ability to disable AJAX UI reloading (option `php-censor.realtime_ui`), improved error trends view. Pull request [#426](https://github.com/php-censor/php-censor/pull/426). Thanks to [@KieranFYI](https://github.com/KieranFYI). -- Improved Ukrainian localization. Pull request [#419](https://github.com/php-censor/php-censor/pull/419). Thanks to [@oshka](https://github.com/oshka). -- Install command return code. -- [PHPUnit] Xdebug settings for coverage option. Pull request [#427](https://github.com/php-censor/php-censor/pull/427). Thanks to [@KieranFYI](https://github.com/KieranFYI). -- [2.0 Changelog](/docs/CHANGELOG_2.0.md) From 53f21768fffb2ebd0837914e7fb105d1b1408ab7 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 11 Jan 2023 22:32:20 +0700 Subject: [PATCH 185/212] Updated last stable version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fe4b3ad0..d993b93c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.10` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.11` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` (Mr. Meeseeks) | `2.1.2` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | From e5a695555e41770c610fad6d72fae9d6555f17cc Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 11 Jan 2023 22:42:15 +0700 Subject: [PATCH 186/212] Added changelog for version 2.1.3 and upgrade VERSION.md for release 2.1.3. --- CHANGELOG.md | 11 + VERSION.md | 2 +- composer.lock | 709 +++++++++++++++++++++++++++----------------------- 3 files changed, 396 insertions(+), 326 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d30739c6b..649c5b98e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.3 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.3) (2023-01-11) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.2...2.1.3) + +### Fixed + +- PHP 8.1 deprecation while searching for composer binary. Pull request [#434](https://github.com/php-censor/php-censor/pull/434). + Thanks to [@StudioMaX](https://github.com/StudioMaX). +- PHP 8.1 error with return type of `php_user_filter::filter` function. + + ## [2.1.2 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.2) (2022-09-01) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.1...2.1.2) diff --git a/VERSION.md b/VERSION.md index eca07e4c1..ac2cdeba0 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/composer.lock b/composer.lock index 34b1507d4..62ff5aa0a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cakephp/core", - "version": "4.4.5", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b" + "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/77e53e3784863c1b8006464b82ab842ee7c58e6b", - "reference": "77e53e3784863c1b8006464b82ab842ee7c58e6b", + "url": "https://api.github.com/repos/cakephp/core/zipball/20e50de2f461b5983a1a1296fe5c3762857b9edd", + "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd", "shasum": "" }, "require": { @@ -61,20 +61,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2022-08-26T02:01:18+00:00" + "time": "2022-10-07T16:40:13+00:00" }, { "name": "cakephp/database", - "version": "4.4.5", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef" + "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/eec6239b0734e2a4dfe212dc93bcd505c7d296ef", - "reference": "eec6239b0734e2a4dfe212dc93bcd505c7d296ef", + "url": "https://api.github.com/repos/cakephp/database/zipball/c12a8f30f802968a885774e2ac3c099f470bf07c", + "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c", "shasum": "" }, "require": { @@ -83,7 +83,8 @@ "php": ">=7.4.0" }, "suggest": { - "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types." + "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types.", + "cakephp/log": "If you want to use query logging without providing a logger yourself." }, "type": "library", "autoload": { @@ -116,20 +117,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2022-08-18T21:01:25+00:00" + "time": "2023-01-03T20:29:38+00:00" }, { "name": "cakephp/datasource", - "version": "4.4.5", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c" + "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/6fbd1f49833dedf3bd351e1a98b18133a6b9e86c", - "reference": "6fbd1f49833dedf3bd351e1a98b18133a6b9e86c", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/cb58adb0e6f52f26fa61d03776b07c157e328c1e", + "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e", "shasum": "" }, "require": { @@ -174,20 +175,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-08-18T20:55:21+00:00" + "time": "2022-11-26T11:46:41+00:00" }, { "name": "cakephp/utility", - "version": "4.4.5", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5" + "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5", - "reference": "7d28a3935f746fcbbfb38e8dddaa9c9d48b251c5", + "url": "https://api.github.com/repos/cakephp/utility/zipball/aa7bba6c39b56751f5c917464f113c924d4ba10f", + "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f", "shasum": "" }, "require": { @@ -233,35 +234,80 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-08-19T06:02:03+00:00" + "time": "2022-11-06T06:40:44+00:00" + }, + { + "name": "doctrine/deprecations", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.3", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" + "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.0", "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", + "doctrine/coding-standard": "^9 || ^10", "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^4.11 || ^5.0" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "Doctrine\\Common\\Lexer\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -293,7 +339,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.3" + "source": "https://github.com/doctrine/lexer/tree/2.1.0" }, "funding": [ { @@ -309,29 +355,28 @@ "type": "tidelift" } ], - "time": "2022-02-28T11:07:21+00:00" + "time": "2022-12-14T08:49:07+00:00" }, { "name": "egulias/email-validator", - "version": "3.2.1", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715" + "reference": "b531a2311709443320c786feb4519cfaf94af796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", + "reference": "b531a2311709443320c786feb4519cfaf94af796", "shasum": "" }, "require": { - "doctrine/lexer": "^1.2", + "doctrine/lexer": "^1.2|^2", "php": ">=7.2", "symfony/polyfill-intl-idn": "^1.15" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^8.5.8|^9.3.3", "vimeo/psalm": "^4" }, @@ -369,7 +414,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.1" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" }, "funding": [ { @@ -377,7 +422,7 @@ "type": "github" } ], - "time": "2022-06-18T20:57:19+00:00" + "time": "2023-01-02T17:26:14+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1527,16 +1572,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.12.12", + "version": "0.12.13", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115" + "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", - "reference": "9a6ce1e7fdf0fa4e602ba5875b5bc9442ccaa115", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/6eb0f295e140ed2804d93396755f0ce9ada4ec07", + "reference": "6eb0f295e140ed2804d93396755f0ce9ada4ec07", "shasum": "" }, "require": { @@ -1607,9 +1652,9 @@ ], "support": { "issues": "https://github.com/cakephp/phinx/issues", - "source": "https://github.com/cakephp/phinx/tree/0.12.12" + "source": "https://github.com/cakephp/phinx/tree/0.12.13" }, - "time": "2022-07-09T18:53:51+00:00" + "time": "2022-10-03T04:57:40+00:00" }, { "name": "sebastian/diff", @@ -1881,16 +1926,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.11", + "version": "v5.4.18", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "5a0fff46df349f0db3fe242263451fddf5277362" + "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/5a0fff46df349f0db3fe242263451fddf5277362", - "reference": "5a0fff46df349f0db3fe242263451fddf5277362", + "url": "https://api.github.com/repos/symfony/cache/zipball/a33fa08a3f37bb44b90e60b9028796d6b811f9ef", + "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef", "shasum": "" }, "require": { @@ -1951,14 +1996,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation", + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", "homepage": "https://symfony.com", "keywords": [ "caching", "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.11" + "source": "https://github.com/symfony/cache/tree/v5.4.18" }, "funding": [ { @@ -1974,7 +2019,7 @@ "type": "tidelift" } ], - "time": "2022-07-28T15:25:17+00:00" + "time": "2022-12-29T16:06:09+00:00" }, { "name": "symfony/cache-contracts", @@ -2136,16 +2181,16 @@ }, { "name": "symfony/console", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" + "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", - "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", + "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", + "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", "shasum": "" }, "require": { @@ -2215,7 +2260,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.12" + "source": "https://github.com/symfony/console/tree/v5.4.17" }, "funding": [ { @@ -2231,20 +2276,20 @@ "type": "tidelift" } ], - "time": "2022-08-17T13:18:05+00:00" + "time": "2022-12-28T14:15:31+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.11", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c1681789f059ab756001052164726ae88512ae3d" + "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d", - "reference": "c1681789f059ab756001052164726ae88512ae3d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4", + "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4", "shasum": "" }, "require": { @@ -2281,7 +2326,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.11" + "source": "https://github.com/symfony/css-selector/tree/v5.4.17" }, "funding": [ { @@ -2297,20 +2342,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2022-12-23T11:40:44+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.11", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62" + "reference": "58f2988128d2d278280781db037677a32cf720db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a8b9251016e9476db73e25fa836904bc0bf74c62", - "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/58f2988128d2d278280781db037677a32cf720db", + "reference": "58f2988128d2d278280781db037677a32cf720db", "shasum": "" }, "require": { @@ -2370,7 +2415,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.11" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.17" }, "funding": [ { @@ -2386,7 +2431,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2022-12-28T13:55:51+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2457,16 +2502,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "291c1e92281a09152dda089f782e23dedd34bd4f" + "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291c1e92281a09152dda089f782e23dedd34bd4f", - "reference": "291c1e92281a09152dda089f782e23dedd34bd4f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", + "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", "shasum": "" }, "require": { @@ -2512,7 +2557,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.12" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.17" }, "funding": [ { @@ -2528,20 +2573,20 @@ "type": "tidelift" } ], - "time": "2022-08-03T13:09:21+00:00" + "time": "2022-12-22T10:31:03+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" + "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", + "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", "shasum": "" }, "require": { @@ -2597,7 +2642,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17" }, "funding": [ { @@ -2613,7 +2658,7 @@ "type": "tidelift" } ], - "time": "2022-05-05T16:45:39+00:00" + "time": "2022-12-12T15:54:21+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2696,16 +2741,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.12", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" + "reference": "ac09569844a9109a5966b9438fc29113ce77cf51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", - "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51", + "reference": "ac09569844a9109a5966b9438fc29113ce77cf51", "shasum": "" }, "require": { @@ -2740,7 +2785,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.12" + "source": "https://github.com/symfony/filesystem/tree/v5.4.13" }, "funding": [ { @@ -2756,20 +2801,20 @@ "type": "tidelift" } ], - "time": "2022-08-02T13:48:16+00:00" + "time": "2022-09-21T19:53:16+00:00" }, { "name": "symfony/finder", - "version": "v5.4.11", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c" + "reference": "40c08632019838dfb3350f18cf5563b8080055fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c", - "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c", + "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", + "reference": "40c08632019838dfb3350f18cf5563b8080055fc", "shasum": "" }, "require": { @@ -2803,7 +2848,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.11" + "source": "https://github.com/symfony/finder/tree/v5.4.17" }, "funding": [ { @@ -2819,20 +2864,20 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:37:50+00:00" + "time": "2022-12-22T10:31:03+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791" + "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4bfe9611b113b15d98a43da68ec9b5a00d56791", - "reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a", + "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a", "shasum": "" }, "require": { @@ -2879,7 +2924,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.12" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.17" }, "funding": [ { @@ -2895,20 +2940,20 @@ "type": "tidelift" } ], - "time": "2022-08-19T07:33:17+00:00" + "time": "2022-12-14T08:23:03+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00" + "reference": "fd816412b76447890efedaf9ddfe8632589ce10c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/076043af11e58b20a68d2fd93f59cdbc6e8fdd00", - "reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00", + "url": "https://api.github.com/repos/symfony/mailer/zipball/fd816412b76447890efedaf9ddfe8632589ce10c", + "reference": "fd816412b76447890efedaf9ddfe8632589ce10c", "shasum": "" }, "require": { @@ -2955,7 +3000,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.12" + "source": "https://github.com/symfony/mailer/tree/v5.4.17" }, "funding": [ { @@ -2971,20 +3016,20 @@ "type": "tidelift" } ], - "time": "2022-08-03T05:17:26+00:00" + "time": "2022-12-14T15:45:23+00:00" }, { "name": "symfony/mime", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90" + "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/03876e9c5a36f5b45e7d9a381edda5421eff8a90", - "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90", + "url": "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63", + "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63", "shasum": "" }, "require": { @@ -2998,7 +3043,8 @@ "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4" + "symfony/mailer": "<4.4", + "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1", @@ -3006,7 +3052,7 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.2|^6.0" + "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" }, "type": "library", "autoload": { @@ -3038,7 +3084,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.12" + "source": "https://github.com/symfony/mime/tree/v5.4.17" }, "funding": [ { @@ -3054,20 +3100,20 @@ "type": "tidelift" } ], - "time": "2022-08-19T14:24:03+00:00" + "time": "2022-12-13T09:59:55+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -3082,7 +3128,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3120,7 +3166,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -3136,20 +3182,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "143f1881e655bebca1312722af8068de235ae5dc" + "reference": "927013f3aac555983a5059aada98e1907d842695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc", - "reference": "143f1881e655bebca1312722af8068de235ae5dc", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", + "reference": "927013f3aac555983a5059aada98e1907d842695", "shasum": "" }, "require": { @@ -3164,7 +3210,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3203,7 +3249,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" }, "funding": [ { @@ -3219,20 +3265,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -3244,7 +3290,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3284,7 +3330,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -3300,20 +3346,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -3327,7 +3373,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3371,7 +3417,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -3387,20 +3433,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -3412,7 +3458,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3455,7 +3501,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -3471,20 +3517,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -3499,7 +3545,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3538,7 +3584,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -3554,20 +3600,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -3576,7 +3622,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3614,7 +3660,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -3630,20 +3676,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -3652,7 +3698,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3693,7 +3739,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -3709,20 +3755,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -3731,7 +3777,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3776,7 +3822,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -3792,20 +3838,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -3814,7 +3860,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3855,7 +3901,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -3871,7 +3917,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", @@ -4020,16 +4066,16 @@ }, { "name": "symfony/string", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" + "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", - "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", + "url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b", + "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b", "shasum": "" }, "require": { @@ -4086,7 +4132,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.12" + "source": "https://github.com/symfony/string/tree/v5.4.17" }, "funding": [ { @@ -4102,20 +4148,20 @@ "type": "tidelift" } ], - "time": "2022-08-12T17:03:11+00:00" + "time": "2022-12-12T15:54:21+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.10", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340" + "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/8fc03ee75eeece3d9be1ef47d26d79bea1afb340", - "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2adac0a9b55f9fb40b983b790509581dc3db0fff", + "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff", "shasum": "" }, "require": { @@ -4159,7 +4205,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.10" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.17" }, "funding": [ { @@ -4175,20 +4221,20 @@ "type": "tidelift" } ], - "time": "2022-05-27T12:56:18+00:00" + "time": "2022-12-22T10:10:04+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.12", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c" + "reference": "edcdc11498108f8967fe95118a7ec8624b94760e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c", - "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/edcdc11498108f8967fe95118a7ec8624b94760e", + "reference": "edcdc11498108f8967fe95118a7ec8624b94760e", "shasum": "" }, "require": { @@ -4234,7 +4280,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.12" + "source": "https://github.com/symfony/yaml/tree/v5.4.17" }, "funding": [ { @@ -4250,7 +4296,7 @@ "type": "tidelift" } ], - "time": "2022-08-02T15:52:22+00:00" + "time": "2022-12-13T09:57:04+00:00" }, { "name": "voku/anti-xss", @@ -4411,16 +4457,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.9", + "version": "6.0.12", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "eb2861c34203a9c2a7c275cba7014d6816604e89" + "reference": "db0583727bb17666bbd2ba238c85babb973fd165" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/eb2861c34203a9c2a7c275cba7014d6816604e89", - "reference": "eb2861c34203a9c2a7c275cba7014d6816604e89", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/db0583727bb17666bbd2ba238c85babb973fd165", + "reference": "db0583727bb17666bbd2ba238c85babb973fd165", "shasum": "" }, "require": { @@ -4433,7 +4479,7 @@ "voku/portable-ascii": "~2.0.0" }, "require-dev": { - "phpstan/phpstan": "1.8.*@dev", + "phpstan/phpstan": "1.9.*@dev", "phpstan/phpstan-strict-rules": "1.4.*@dev", "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0", "thecodingmachine/phpstan-strict-rules": "1.0.*@dev", @@ -4486,7 +4532,7 @@ ], "support": { "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.9" + "source": "https://github.com/voku/portable-utf8/tree/6.0.12" }, "funding": [ { @@ -4510,7 +4556,7 @@ "type": "tidelift" } ], - "time": "2022-09-01T09:54:03+00:00" + "time": "2023-01-11T12:26:16+00:00" } ], "packages-dev": [ @@ -5010,32 +5056,35 @@ }, { "name": "doctrine/annotations", - "version": "1.13.3", + "version": "1.14.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0" + "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b", + "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", + "doctrine/lexer": "^1 || ^2", "ext-tokenizer": "*", "php": "^7.1 || ^8.0", "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2", + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6", "vimeo/psalm": "^4.10" }, + "suggest": { + "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" + }, "type": "library", "autoload": { "psr-4": { @@ -5077,36 +5126,36 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.3" + "source": "https://github.com/doctrine/annotations/tree/1.14.2" }, - "time": "2022-07-02T10:48:51+00:00" + "time": "2022-12-15T06:48:22+00:00" }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -5133,7 +5182,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -5149,7 +5198,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -5775,16 +5824,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.0.0", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", "shasum": "" }, "require": { @@ -5820,22 +5869,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" }, - "time": "2020-12-01T19:48:11+00:00" + "time": "2022-12-08T20:46:14+00:00" }, { "name": "nikic/php-parser", - "version": "v4.14.0", + "version": "v4.15.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", "shasum": "" }, "require": { @@ -5876,9 +5925,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2022-11-12T15:38:23+00:00" }, { "name": "ondram/ci-detector", @@ -6007,16 +6056,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.11.0", + "version": "2.12.1", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "9141e6f8e1f044aa64aedb0e6894d12618cdcb3e" + "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9141e6f8e1f044aa64aedb0e6894d12618cdcb3e", - "reference": "9141e6f8e1f044aa64aedb0e6894d12618cdcb3e", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/7a892d56ceafd804b4a2ecc85184640937ce9e84", + "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84", "shasum": "" }, "require": { @@ -6052,7 +6101,7 @@ "description": "Official version of pdepend to be handled with Composer", "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.11.0" + "source": "https://github.com/pdepend/pdepend/tree/2.12.1" }, "funding": [ { @@ -6060,7 +6109,7 @@ "type": "tidelift" } ], - "time": "2022-08-29T11:21:12+00:00" + "time": "2022-09-08T19:30:37+00:00" }, { "name": "phar-io/manifest", @@ -6469,25 +6518,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -6513,9 +6567,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-03-15T21:29:03+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phploc/phploc", @@ -6580,22 +6634,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.12.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec" + "reference": "dad0228156856b3ad959992f9748514fa943f3e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec", - "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3", + "reference": "dad0228156856b3ad959992f9748514fa943f3e3", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.10.3", + "pdepend/pdepend": "^2.12.1", "php": ">=5.3.9" }, "require-dev": { @@ -6651,7 +6705,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.12.0" + "source": "https://github.com/phpmd/phpmd/tree/2.13.0" }, "funding": [ { @@ -6659,25 +6713,25 @@ "type": "tidelift" } ], - "time": "2022-03-24T13:33:01+00:00" + "time": "2022-09-10T08:44:15+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" + "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359", + "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" @@ -6724,9 +6778,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.16.0" }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-11-29T15:06:56+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -6782,16 +6836,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { @@ -6847,7 +6901,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -6855,7 +6909,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7100,16 +7154,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.5.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", "shasum": "" }, "require": { @@ -7131,14 +7185,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { @@ -7182,7 +7236,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" }, "funding": [ { @@ -7192,9 +7246,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2022-12-09T07:31:23+00:00" }, { "name": "sanmai/later", @@ -7256,16 +7314,16 @@ }, { "name": "sanmai/pipeline", - "version": "v6.1", + "version": "v6.3", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "3a88f2617237e18d5cd2aa38ca3d4b22770306c2" + "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/3a88f2617237e18d5cd2aa38ca3d4b22770306c2", - "reference": "3a88f2617237e18d5cd2aa38ca3d4b22770306c2", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/929b115ca58d62b6b2574702df1ebde4562c7c43", + "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43", "shasum": "" }, "require": { @@ -7309,7 +7367,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.1" + "source": "https://github.com/sanmai/pipeline/tree/v6.3" }, "funding": [ { @@ -7317,7 +7375,7 @@ "type": "github" } ], - "time": "2022-01-30T08:15:59+00:00" + "time": "2022-11-30T06:07:06+00:00" }, { "name": "sebastian/cli-parser", @@ -7488,16 +7546,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -7550,7 +7608,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -7558,7 +7616,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -7682,16 +7740,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -7747,7 +7805,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -7755,7 +7813,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -8171,16 +8229,16 @@ }, { "name": "sebastian/type", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb44e1cc6e557418387ad815780360057e40753e" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e", - "reference": "fb44e1cc6e557418387ad815780360057e40753e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -8192,7 +8250,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -8215,7 +8273,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -8223,7 +8281,7 @@ "type": "github" } ], - "time": "2022-08-29T06:55:37+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", @@ -8469,16 +8527,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.5", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" + "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69", + "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69", "shasum": "" }, "require": { @@ -8511,7 +8569,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.13" }, "funding": [ { @@ -8527,20 +8585,20 @@ "type": "tidelift" } ], - "time": "2022-02-18T16:06:09+00:00" + "time": "2022-09-28T13:19:49+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.44", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed" + "reference": "1069c7a3fca74578022fab6f81643248d02f8e63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f19951007dae942cc79b979c1fe26bfdfbeb54ed", - "reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63", + "reference": "1069c7a3fca74578022fab6f81643248d02f8e63", "shasum": "" }, "require": { @@ -8600,7 +8658,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.44" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.47" }, "funding": [ { @@ -8616,7 +8674,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-10-03T15:15:11+00:00" }, { "name": "thecodingmachine/safe", @@ -8809,16 +8867,16 @@ }, { "name": "vimeo/psalm", - "version": "4.26.0", + "version": "4.30.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "6998fabb2bf528b65777bf9941920888d23c03ac" + "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac", - "reference": "6998fabb2bf528b65777bf9941920888d23c03ac", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0bc6e25d89f649e4f36a534f330f8bb4643dd69", + "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69", "shasum": "" }, "require": { @@ -8857,6 +8915,7 @@ "phpdocumentor/reflection-docblock": "^5", "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", + "phpstan/phpdoc-parser": "1.2.* || 1.6.4", "phpunit/phpunit": "^9.0", "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", @@ -8910,9 +8969,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.26.0" + "source": "https://github.com/vimeo/psalm/tree/4.30.0" }, - "time": "2022-07-31T13:10:26+00:00" + "time": "2022-11-06T20:37:08+00:00" }, { "name": "webmozart/assert", From 4c60f2624f2bdbdc7cba04c86b04b6ea9eca3eed Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 11 Jan 2023 22:59:29 +0700 Subject: [PATCH 187/212] Updated current stable version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d993b93c6..408dc8b9b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ PHP Censor versions: | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `2.0` (Rick Sanchez) | `2.0.11` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.2` | `release-2.1` | Current stable version | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.3` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From ee17cb22e4ed55c1191bc58d9905764f15b9e955 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 22 Jan 2023 23:02:56 +0700 Subject: [PATCH 188/212] Added CLI command for add/update secrets. --- src/Command/AddSecretCommand.php | 93 +++++++++++++++++++ ...mand.php => CheckLocalizationsCommand.php} | 20 ++-- src/Command/CreateBuildCommand.php | 7 +- src/Command/InstallCommand.php | 2 +- src/Command/WorkerCommand.php | 12 +-- src/Console/Application.php | 10 +- 6 files changed, 121 insertions(+), 23 deletions(-) create mode 100644 src/Command/AddSecretCommand.php rename src/Command/{CheckLocalizationCommand.php => CheckLocalizationsCommand.php} (82%) diff --git a/src/Command/AddSecretCommand.php b/src/Command/AddSecretCommand.php new file mode 100644 index 000000000..c0ca71e99 --- /dev/null +++ b/src/Command/AddSecretCommand.php @@ -0,0 +1,93 @@ + + */ +class AddSecretCommand extends Command +{ + private SecretStore $secretStore; + + public function __construct( + ConfigurationInterface $configuration, + DatabaseManager $databaseManager, + StoreRegistry $storeRegistry, + LoggerInterface $logger, + SecretStore $secretStore, + ?string $name = null + ) { + parent::__construct($configuration, $databaseManager, $storeRegistry, $logger, $name); + + $this->secretStore = $secretStore; + } + + /** + * Configure. + */ + protected function configure(): void + { + $this + ->setName('php-censor:add-secret') + + ->addArgument('secret-name', InputArgument::REQUIRED, 'Secret name') + ->addArgument('secret-value', InputArgument::REQUIRED, 'Secret value') + + ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force to update existing values', false) + + ->setDescription('Update secret'); + } + + /** + * Loops through projects. + * + * @throws HttpException + */ + protected function execute(InputInterface $input, OutputInterface $output): int + { + $secretName = $input->getArgument('secret-name'); + $secretValue = $input->getArgument('secret-value'); + $force = (bool)$input->getOption('force'); + + $secrets = $this->secretStore->getByNames([$secretName]); + if ($secrets && !$force) { + $output->writeln( + 'Secret with name "%s" already exists! Use flag "-f|--force" if you want update secret.' + ); + + return 1; + } + + $secret = new Secret($this->storeRegistry); + $secret->setCreateDate(new \DateTime()); + $secret->setUserId(null); + $secret->setName($secretName); + + if ($force) { + $secret = $secrets[0]; + } + + $secret->setValue($secretValue); + + $this->secretStore->save($secret); + + return 0; + } +} diff --git a/src/Command/CheckLocalizationCommand.php b/src/Command/CheckLocalizationsCommand.php similarity index 82% rename from src/Command/CheckLocalizationCommand.php rename to src/Command/CheckLocalizationsCommand.php index 10f81be1c..28f15f798 100644 --- a/src/Command/CheckLocalizationCommand.php +++ b/src/Command/CheckLocalizationsCommand.php @@ -14,7 +14,7 @@ * * @author Dmitry Khomutov */ -class CheckLocalizationCommand extends Command +class CheckLocalizationsCommand extends Command { protected string $basePath = __DIR__ . '/../Languages'; @@ -25,27 +25,25 @@ protected function configure(): void $this ->setName('php-censor:check-localizations') - ->addOption('same', 0, InputOption::VALUE_OPTIONAL, 'Same than English version (0 = no, 1 = yes)') - ->addOption('langs', [], InputOption::VALUE_OPTIONAL, 'List of languages separated by commas. By default, all languages') + ->addOption('same', 's', InputOption::VALUE_NONE, 'Same than English version', false) + ->addOption('languages', 'l', InputOption::VALUE_OPTIONAL, 'List of languages separated by commas. By default, all languages', '') - ->setDescription('Check localizations.'); + ->setDescription('Check localizations'); } protected function execute(InputInterface $input, OutputInterface $output): int { $output->writeln("\nCheck localizations!"); - $sameThanEnglish = (null !== $input->getOption('same')) - ? $input->getOption('same') - : false; + $sameThanEnglish = (bool)$input->getOption('same'); - $languagesList = (null !== $input->getOption('langs')) - ? \explode(',', $input->getOption('langs')) + $languages = $input->getOption('languages') + ? \explode(',', $input->getOption('languages')) : []; // Get English version - $english = $this->getTranslations($this->basePath.'/lang.en.php'); - $othersLanguages = $this->getLanguages($languagesList); + $english = $this->getTranslations($this->basePath . '/lang.en.php'); + $othersLanguages = $this->getLanguages($languages); $diffs = $this->compareTranslations($english, $othersLanguages); foreach ($diffs as $language => $value) { diff --git a/src/Command/CreateBuildCommand.php b/src/Command/CreateBuildCommand.php index fcebb607f..b7422cf00 100644 --- a/src/Command/CreateBuildCommand.php +++ b/src/Command/CreateBuildCommand.php @@ -54,11 +54,12 @@ protected function configure(): void $this ->setName('php-censor:create-build') - ->addArgument('projectId', InputArgument::REQUIRED, 'A project ID') + ->addArgument('project-id', InputArgument::REQUIRED, 'A project ID') ->addOption('commit', null, InputOption::VALUE_OPTIONAL, 'Commit ID to build') ->addOption('branch', null, InputOption::VALUE_OPTIONAL, 'Branch to build') ->addOption('email', null, InputOption::VALUE_OPTIONAL, 'Committer email') ->addOption('message', null, InputOption::VALUE_OPTIONAL, 'Commit message') + ->addOption('environment', null, InputOption::VALUE_OPTIONAL, 'Build environment') ->setDescription('Create a build for a project'); } @@ -70,10 +71,10 @@ protected function configure(): void */ public function execute(InputInterface $input, OutputInterface $output): int { - $projectId = (int)$input->getArgument('projectId'); + $projectId = (int)$input->getArgument('project-id'); $commitId = $input->getOption('commit'); $branch = $input->getOption('branch'); - $environment = $input->hasOption('environment') ? $input->getOption('environment') : null; + $environment = $input->getOption('environment'); $ciEmail = $input->getOption('email'); $ciMessage = $input->getOption('message'); diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index 051420e69..5e743416a 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -89,7 +89,7 @@ protected function configure(): void ->addOption( 'config-from-file', null, - InputOption::VALUE_OPTIONAL, + InputOption::VALUE_NONE, 'Take config from file and ignore options', false ) diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index f98be5d19..0d28f0a21 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -5,7 +5,6 @@ namespace PHPCensor\Command; use Exception; -use Monolog\Logger; use Pheanstalk\Contract\PheanstalkInterface; use PHPCensor\BuildFactory; use PHPCensor\Common\Application\ConfigurationInterface; @@ -53,20 +52,21 @@ public function __construct( protected function configure(): void { - $whenHints = 'soon=when next job done (default), done=when current jobs done, idle=when waiting for jobs'; $this ->setName('php-censor:worker') ->addOption( 'periodical-work', 'p', InputOption::VALUE_NONE, - 'Allow worker run periodical work' + 'Allow worker run periodical work', + false ) ->addOption( 'stop-worker', 's', InputOption::VALUE_OPTIONAL, - "Gracefully stop one worker ($whenHints)" + "Gracefully stop one worker ('soon' = when next job done, 'done' = when current jobs done, 'idle' = when waiting for jobs)", + '' ) ->setDescription('Runs the PHP Censor build worker.'); } @@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int return 0; } - $canPeriodicalWork = $input->hasOption('periodical-work') && $input->getOption('periodical-work'); + $periodicalWork = (bool)$input->getOption('periodical-work'); $worker = new BuildWorker( $this->configuration, $this->databaseManager, @@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $config['host'], (int)$this->configuration->get('php-censor.queue.port', PheanstalkInterface::DEFAULT_PORT), $config['name'], - $canPeriodicalWork + $periodicalWork ); $worker->startWorker(); diff --git a/src/Console/Application.php b/src/Console/Application.php index ee1dbf32c..d4d6098a8 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -15,7 +15,8 @@ use Phinx\Console\Command\Rollback; use Phinx\Console\Command\Status; use PHPCensor\BuildFactory; -use PHPCensor\Command\CheckLocalizationCommand; +use PHPCensor\Command\AddSecretCommand; +use PHPCensor\Command\CheckLocalizationsCommand; use PHPCensor\Command\CreateAdminCommand; use PHPCensor\Command\CreateBuildCommand; use PHPCensor\Command\InstallCommand; @@ -30,6 +31,7 @@ use PHPCensor\Service\BuildService; use PHPCensor\Store\BuildStore; use PHPCensor\Store\ProjectStore; +use PHPCensor\Store\SecretStore; use PHPCensor\Store\UserStore; use PHPCensor\StoreRegistry; use Symfony\Component\Console\Application as BaseApplication; @@ -179,6 +181,9 @@ public function __construct( /** @var BuildStore $buildStore */ $buildStore = $this->storeRegistry->get('Build'); + /** @var SecretStore $secretStore */ + $secretStore = $this->storeRegistry->get('Secret'); + $buildFactory = new BuildFactory( $this->configuration, $this->storeRegistry @@ -200,7 +205,8 @@ public function __construct( $this->add(new RemoveOldBuildsCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $projectStore, $buildService)); $this->add(new WorkerCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $buildService, $buildFactory)); $this->add(new RebuildQueueCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); - $this->add(new CheckLocalizationCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); + $this->add(new CheckLocalizationsCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger)); + $this->add(new AddSecretCommand($this->configuration, $this->databaseManager, $this->storeRegistry, $logger, $secretStore)); } public function getHelp(): string From 0d1e333bad039b24ae5e2d2aff5225dc18cb7ab7 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 22 Jan 2023 23:06:11 +0700 Subject: [PATCH 189/212] Added CLI command for add/update secrets (Fixed tests). --- tests/src/Command/CreateBuildCommandTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/src/Command/CreateBuildCommandTest.php b/tests/src/Command/CreateBuildCommandTest.php index b4dac954c..81b2ec72a 100644 --- a/tests/src/Command/CreateBuildCommandTest.php +++ b/tests/src/Command/CreateBuildCommandTest.php @@ -85,9 +85,9 @@ public function testExecute(): void { $commandTester = $this->getCommandTester(); - $commandTester->execute(['projectId' => 1]); - $commandTester->execute(['projectId' => 1, '--commit' => '92c8c6e']); - $commandTester->execute(['projectId' => 1, '--branch' => 'master']); + $commandTester->execute(['project-id' => 1]); + $commandTester->execute(['project-id' => 1, '--commit' => '92c8c6e']); + $commandTester->execute(['project-id' => 1, '--branch' => 'master']); self::assertTrue(true); } @@ -97,6 +97,6 @@ public function testExecuteWithUnknownProjectId(): void self::expectException(InvalidArgumentException::class); $commandTester = $this->getCommandTester(); - $commandTester->execute(['projectId' => 2]); + $commandTester->execute(['project-id' => 2]); } } From 918557f3bfec0f0ea22fcc669655fdd71939a79e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 31 Jan 2023 16:52:28 +0700 Subject: [PATCH 190/212] Added CLI command for add/update secrets (Fixed validation). --- src/Command/AddSecretCommand.php | 18 ++++++++++-------- src/Controller/SecretController.php | 2 +- src/Model/Secret.php | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Command/AddSecretCommand.php b/src/Command/AddSecretCommand.php index c0ca71e99..b1b436789 100644 --- a/src/Command/AddSecretCommand.php +++ b/src/Command/AddSecretCommand.php @@ -14,7 +14,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use PHPCensor\Exception\HttpException; /** * @package PHP Censor @@ -55,15 +54,10 @@ protected function configure(): void ->setDescription('Update secret'); } - /** - * Loops through projects. - * - * @throws HttpException - */ protected function execute(InputInterface $input, OutputInterface $output): int { - $secretName = $input->getArgument('secret-name'); - $secretValue = $input->getArgument('secret-value'); + $secretName = (string)$input->getArgument('secret-name'); + $secretValue = (string)$input->getArgument('secret-value'); $force = (bool)$input->getOption('force'); $secrets = $this->secretStore->getByNames([$secretName]); @@ -75,6 +69,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int return 1; } + if (!\preg_match(\sprintf('#%s#', Secret::SECRET_NAME_PATTERN), $secretName)) { + $output->writeln( + 'Secret name "%s" is invalid! Use only letters, numbers and "-" or "_".' + ); + + return 2; + } + $secret = new Secret($this->storeRegistry); $secret->setCreateDate(new \DateTime()); $secret->setUserId(null); diff --git a/src/Controller/SecretController.php b/src/Controller/SecretController.php index 0f3b42d93..3ed942c6d 100644 --- a/src/Controller/SecretController.php +++ b/src/Controller/SecretController.php @@ -100,7 +100,7 @@ public function edit(?int $secretId = null) $field ->setClass('form-control') ->setContainerClass('form-group') - ->setPattern('^[-_\w\d]+$') + ->setPattern(Secret::SECRET_NAME_PATTERN) ->setValue($secret->getName()); $form->addField($field); diff --git a/src/Model/Secret.php b/src/Model/Secret.php index 211626a4f..e0e241d46 100644 --- a/src/Model/Secret.php +++ b/src/Model/Secret.php @@ -14,4 +14,5 @@ */ class Secret extends BaseSecret { + public const SECRET_NAME_PATTERN = '^[-_\w\d]+$'; } From 2d1ab894490700f9cb077d54be647a31fbc64039 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 17 Feb 2023 16:12:21 +0700 Subject: [PATCH 191/212] Added CLI command for add/update secrets (Some fixes). --- src/Command/AddSecretCommand.php | 10 +++++----- src/Command/CheckLocalizationsCommand.php | 2 +- src/Command/InstallCommand.php | 3 +-- src/Command/WorkerCommand.php | 3 +-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Command/AddSecretCommand.php b/src/Command/AddSecretCommand.php index b1b436789..754b3fa7c 100644 --- a/src/Command/AddSecretCommand.php +++ b/src/Command/AddSecretCommand.php @@ -49,7 +49,7 @@ protected function configure(): void ->addArgument('secret-name', InputArgument::REQUIRED, 'Secret name') ->addArgument('secret-value', InputArgument::REQUIRED, 'Secret value') - ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force to update existing values', false) + ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force to update existing values') ->setDescription('Update secret'); } @@ -63,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $secrets = $this->secretStore->getByNames([$secretName]); if ($secrets && !$force) { $output->writeln( - 'Secret with name "%s" already exists! Use flag "-f|--force" if you want update secret.' + \sprintf('Secret with name "%s" already exists! Use flag "-f|--force" if you want update secret.', $secretName) ); return 1; @@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int if (!\preg_match(\sprintf('#%s#', Secret::SECRET_NAME_PATTERN), $secretName)) { $output->writeln( - 'Secret name "%s" is invalid! Use only letters, numbers and "-" or "_".' + \sprintf('Secret name "%s" is invalid! Use only letters, numbers and "-" or "_".', $secretName) ); return 2; @@ -82,8 +82,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int $secret->setUserId(null); $secret->setName($secretName); - if ($force) { - $secret = $secrets[0]; + if ($secrets && $force) { + $secret = $secrets[$secretName]; } $secret->setValue($secretValue); diff --git a/src/Command/CheckLocalizationsCommand.php b/src/Command/CheckLocalizationsCommand.php index 28f15f798..e655fa2e3 100644 --- a/src/Command/CheckLocalizationsCommand.php +++ b/src/Command/CheckLocalizationsCommand.php @@ -25,7 +25,7 @@ protected function configure(): void $this ->setName('php-censor:check-localizations') - ->addOption('same', 's', InputOption::VALUE_NONE, 'Same than English version', false) + ->addOption('same', 's', InputOption::VALUE_NONE, 'Same than English version') ->addOption('languages', 'l', InputOption::VALUE_OPTIONAL, 'List of languages separated by commas. By default, all languages', '') ->setDescription('Check localizations'); diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index 5e743416a..f688917f9 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -90,8 +90,7 @@ protected function configure(): void 'config-from-file', null, InputOption::VALUE_NONE, - 'Take config from file and ignore options', - false + 'Take config from file and ignore options' ) ->setDescription('Install PHP Censor'); diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 0d28f0a21..7d70be3b0 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -58,8 +58,7 @@ protected function configure(): void 'periodical-work', 'p', InputOption::VALUE_NONE, - 'Allow worker run periodical work', - false + 'Allow worker run periodical work' ) ->addOption( 'stop-worker', From 30d60024208308902d17278c78d01155a869e46c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Tue, 19 Dec 2023 10:58:26 +0700 Subject: [PATCH 192/212] Updated dependencies. Fixed: guzzlehttp/psr7 (1.9.0) CVE-2023-29197: Improper header validation https://github.com/guzzle/psr7/security/advisories/GHSA-wxmh-65f7-jcvw. --- composer.lock | 1054 +++++++++++++++++++++++++++---------------------- 1 file changed, 573 insertions(+), 481 deletions(-) diff --git a/composer.lock b/composer.lock index 61e38837b..17177fcb1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,26 +4,29 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e358ae009c0e1eb5935d495a57c18e1b", + "content-hash": "b021933c25e0840d8c885e184593250d", "packages": [ { "name": "cakephp/core", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd" + "reference": "c2f4dff110d41e475d1041f2abe236f1c62d0cd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/20e50de2f461b5983a1a1296fe5c3762857b9edd", - "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd", + "url": "https://api.github.com/repos/cakephp/core/zipball/c2f4dff110d41e475d1041f2abe236f1c62d0cd0", + "reference": "c2f4dff110d41e475d1041f2abe236f1c62d0cd0", "shasum": "" }, "require": { "cakephp/utility": "^4.0", "php": ">=7.4.0" }, + "provide": { + "psr/container-implementation": "^1.0 || ^2.0" + }, "suggest": { "cakephp/cache": "To use Configure::store() and restore().", "cakephp/event": "To use PluginApplicationInterface or plugin applications.", @@ -61,20 +64,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2022-10-07T16:40:13+00:00" + "time": "2023-10-21T13:30:46+00:00" }, { "name": "cakephp/database", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c" + "reference": "317739cc32060ef19b6c19c87ac6b64848d78e27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/c12a8f30f802968a885774e2ac3c099f470bf07c", - "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c", + "url": "https://api.github.com/repos/cakephp/database/zipball/317739cc32060ef19b6c19c87ac6b64848d78e27", + "reference": "317739cc32060ef19b6c19c87ac6b64848d78e27", "shasum": "" }, "require": { @@ -117,20 +120,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2023-01-03T20:29:38+00:00" + "time": "2023-12-07T12:23:54+00:00" }, { "name": "cakephp/datasource", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e" + "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/cb58adb0e6f52f26fa61d03776b07c157e328c1e", - "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/5d11a35ffc09dee744faaab7f758aeb42c17cfec", + "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec", "shasum": "" }, "require": { @@ -175,20 +178,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-11-26T11:46:41+00:00" + "time": "2023-11-05T07:32:10+00:00" }, { "name": "cakephp/utility", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f" + "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/aa7bba6c39b56751f5c917464f113c924d4ba10f", - "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f", + "url": "https://api.github.com/repos/cakephp/utility/zipball/9fb72974e91e81f1545a15a6d45f50c82cd77def", + "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def", "shasum": "" }, "require": { @@ -234,29 +237,33 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-11-06T06:40:44+00:00" + "time": "2023-04-11T21:22:06+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -275,9 +282,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/lexer", @@ -359,16 +366,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "b531a2311709443320c786feb4519cfaf94af796" + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", - "reference": "b531a2311709443320c786feb4519cfaf94af796", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", "shasum": "" }, "require": { @@ -414,7 +421,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.6" }, "funding": [ { @@ -422,7 +429,7 @@ "type": "github" } ], - "time": "2023-01-02T17:26:14+00:00" + "time": "2023-06-01T07:04:22+00:00" }, { "name": "guzzlehttp/guzzle", @@ -541,16 +548,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -560,11 +567,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -605,7 +607,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -621,20 +623,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -653,11 +655,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -715,7 +712,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.0" + "source": "https://github.com/guzzle/psr7/tree/1.9.1" }, "funding": [ { @@ -731,7 +728,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "jasongrimes/paginator", @@ -837,16 +834,16 @@ }, { "name": "monolog/monolog", - "version": "2.8.0", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -861,7 +858,7 @@ "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", @@ -923,7 +920,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.8.0" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -935,7 +932,7 @@ "type": "tidelift" } ], - "time": "2022-07-24T11:55:47+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "pda/pheanstalk", @@ -1328,25 +1325,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1375,9 +1372,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -1612,16 +1609,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -1666,7 +1663,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -1674,7 +1671,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -1808,16 +1805,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.11", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027" + "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ed1f634a36606f2065eec221b3975e05016cbbe", + "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe", "shasum": "" }, "require": { @@ -1860,7 +1857,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.11" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.31" }, "funding": [ { @@ -1876,20 +1873,20 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:05+00:00" + "time": "2023-10-31T07:58:33+00:00" }, { "name": "symfony/cache", - "version": "v5.4.18", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef" + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a33fa08a3f37bb44b90e60b9028796d6b811f9ef", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef", + "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40", + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40", "shasum": "" }, "require": { @@ -1917,7 +1914,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", @@ -1957,7 +1954,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.18" + "source": "https://github.com/symfony/cache/tree/v5.4.32" }, "funding": [ { @@ -1973,7 +1970,7 @@ "type": "tidelift" } ], - "time": "2022-12-29T16:06:09+00:00" + "time": "2023-11-24T13:04:07+00:00" }, { "name": "symfony/cache-contracts", @@ -2056,16 +2053,16 @@ }, { "name": "symfony/config", - "version": "v5.4.11", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "ec79e03125c1d2477e43dde8528535d90cc78379" + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/ec79e03125c1d2477e43dde8528535d90cc78379", - "reference": "ec79e03125c1d2477e43dde8528535d90cc78379", + "url": "https://api.github.com/repos/symfony/config/zipball/dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", "shasum": "" }, "require": { @@ -2115,7 +2112,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.11" + "source": "https://github.com/symfony/config/tree/v5.4.31" }, "funding": [ { @@ -2131,20 +2128,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-11-09T08:22:43+00:00" }, { "name": "symfony/console", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", + "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", "shasum": "" }, "require": { @@ -2209,12 +2206,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.17" + "source": "https://github.com/symfony/console/tree/v5.4.32" }, "funding": [ { @@ -2230,20 +2227,20 @@ "type": "tidelift" } ], - "time": "2022-12-28T14:15:31+00:00" + "time": "2023-11-18T18:23:04+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -2280,7 +2277,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.17" + "source": "https://github.com/symfony/css-selector/tree/v5.4.26" }, "funding": [ { @@ -2296,20 +2293,20 @@ "type": "tidelift" } ], - "time": "2022-12-23T11:40:44+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.17", + "version": "v5.4.33", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "58f2988128d2d278280781db037677a32cf720db" + "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/58f2988128d2d278280781db037677a32cf720db", - "reference": "58f2988128d2d278280781db037677a32cf720db", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14969a558cd6382b2a12b14b20ef9a851a02da79", + "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79", "shasum": "" }, "require": { @@ -2369,7 +2366,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.17" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.33" }, "funding": [ { @@ -2385,7 +2382,7 @@ "type": "tidelift" } ], - "time": "2022-12-28T13:55:51+00:00" + "time": "2023-11-30T08:15:37+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2456,16 +2453,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b" + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201", + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201", "shasum": "" }, "require": { @@ -2511,7 +2508,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.17" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32" }, "funding": [ { @@ -2527,20 +2524,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-11-17T20:43:48+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9" + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", - "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", "shasum": "" }, "require": { @@ -2596,7 +2593,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" }, "funding": [ { @@ -2612,7 +2609,7 @@ "type": "tidelift" } ], - "time": "2022-12-12T15:54:21+00:00" + "time": "2023-07-06T06:34:20+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2695,16 +2692,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.13", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -2739,7 +2736,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.13" + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" }, "funding": [ { @@ -2755,20 +2752,20 @@ "type": "tidelift" } ], - "time": "2022-09-21T19:53:16+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/finder", - "version": "v5.4.17", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc" + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", "shasum": "" }, "require": { @@ -2802,7 +2799,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.17" + "source": "https://github.com/symfony/finder/tree/v5.4.27" }, "funding": [ { @@ -2818,20 +2815,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-07-31T08:02:31+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a" + "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a", - "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cbcd80a4c36f59772d62860fdb0cb6a38da63fd2", + "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2", "shasum": "" }, "require": { @@ -2878,7 +2875,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.17" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.32" }, "funding": [ { @@ -2894,24 +2891,24 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:23:03+00:00" + "time": "2023-11-20T15:40:25+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.17", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c" + "reference": "5ca8a7628a5ee69767047dd0f4cf4c9521c999b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/fd816412b76447890efedaf9ddfe8632589ce10c", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c", + "url": "https://api.github.com/repos/symfony/mailer/zipball/5ca8a7628a5ee69767047dd0f4cf4c9521c999b8", + "reference": "5ca8a7628a5ee69767047dd0f4cf4c9521c999b8", "shasum": "" }, "require": { - "egulias/email-validator": "^2.1.10|^3", + "egulias/email-validator": "^2.1.10|^3|^4", "php": ">=7.2.5", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", @@ -2925,7 +2922,7 @@ "symfony/http-kernel": "<4.4" }, "require-dev": { - "symfony/http-client-contracts": "^1.1|^2|^3", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/messenger": "^4.4|^5.0|^6.0" }, "type": "library", @@ -2954,7 +2951,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.17" + "source": "https://github.com/symfony/mailer/tree/v5.4.31" }, "funding": [ { @@ -2970,20 +2967,20 @@ "type": "tidelift" } ], - "time": "2022-12-14T15:45:23+00:00" + "time": "2023-11-03T16:16:43+00:00" }, { "name": "symfony/mime", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63" + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63", + "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", "shasum": "" }, "require": { @@ -2998,15 +2995,15 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" }, "type": "library", "autoload": { @@ -3038,7 +3035,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.17" + "source": "https://github.com/symfony/mime/tree/v5.4.26" }, "funding": [ { @@ -3054,20 +3051,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:59:55+00:00" + "time": "2023-07-27T06:29:31+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -3082,7 +3079,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3120,7 +3117,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3136,20 +3133,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "927013f3aac555983a5059aada98e1907d842695" + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -3164,7 +3161,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3203,7 +3200,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" }, "funding": [ { @@ -3219,20 +3216,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -3244,7 +3241,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3284,7 +3281,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -3300,20 +3297,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -3327,7 +3324,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3371,7 +3368,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -3387,20 +3384,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -3412,7 +3409,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3455,7 +3452,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -3471,20 +3468,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -3499,7 +3496,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3538,7 +3535,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -3554,20 +3551,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -3576,7 +3573,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3614,7 +3611,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -3630,20 +3627,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -3652,7 +3649,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3693,7 +3690,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -3709,20 +3706,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -3731,7 +3728,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3776,7 +3773,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -3792,20 +3789,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -3814,7 +3811,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3855,7 +3852,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -3871,20 +3868,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v5.4.11", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1" + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1", + "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", "shasum": "" }, "require": { @@ -3917,7 +3914,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.11" + "source": "https://github.com/symfony/process/tree/v5.4.28" }, "funding": [ { @@ -3933,7 +3930,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2023-08-07T10:36:04+00:00" }, { "name": "symfony/service-contracts", @@ -4020,16 +4017,16 @@ }, { "name": "symfony/string", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b" + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b", + "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04", + "reference": "91bf4453d65d8231688a04376c3a40efe0770f04", "shasum": "" }, "require": { @@ -4086,7 +4083,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.17" + "source": "https://github.com/symfony/string/tree/v5.4.32" }, "funding": [ { @@ -4102,20 +4099,20 @@ "type": "tidelift" } ], - "time": "2022-12-12T15:54:21+00:00" + "time": "2023-11-26T13:43:46+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff" + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2adac0a9b55f9fb40b983b790509581dc3db0fff", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add", + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add", "shasum": "" }, "require": { @@ -4159,7 +4156,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.17" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.32" }, "funding": [ { @@ -4175,20 +4172,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:10:04+00:00" + "time": "2023-11-16T19:33:05+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.17", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e" + "reference": "f387675d7f5fc4231f7554baa70681f222f73563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/edcdc11498108f8967fe95118a7ec8624b94760e", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563", + "reference": "f387675d7f5fc4231f7554baa70681f222f73563", "shasum": "" }, "require": { @@ -4234,7 +4231,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.17" + "source": "https://github.com/symfony/yaml/tree/v5.4.31" }, "funding": [ { @@ -4250,20 +4247,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:57:04+00:00" + "time": "2023-11-03T14:41:28+00:00" }, { "name": "voku/anti-xss", - "version": "4.1.39", + "version": "4.1.42", "source": { "type": "git", "url": "https://github.com/voku/anti-xss.git", - "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0" + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/anti-xss/zipball/64a59ba4744e6722866ff3440d93561da9e85cd0", - "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675", + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675", "shasum": "" }, "require": { @@ -4309,7 +4306,7 @@ ], "support": { "issues": "https://github.com/voku/anti-xss/issues", - "source": "https://github.com/voku/anti-xss/tree/4.1.39" + "source": "https://github.com/voku/anti-xss/tree/4.1.42" }, "funding": [ { @@ -4333,7 +4330,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:58+00:00" + "time": "2023-07-03T14:40:46+00:00" }, { "name": "voku/portable-ascii", @@ -4411,16 +4408,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.12", + "version": "6.0.13", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "db0583727bb17666bbd2ba238c85babb973fd165" + "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/db0583727bb17666bbd2ba238c85babb973fd165", - "reference": "db0583727bb17666bbd2ba238c85babb973fd165", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", + "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", "shasum": "" }, "require": { @@ -4486,7 +4483,7 @@ ], "support": { "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.12" + "source": "https://github.com/voku/portable-utf8/tree/6.0.13" }, "funding": [ { @@ -4510,7 +4507,7 @@ "type": "tidelift" } ], - "time": "2023-01-11T12:26:16+00:00" + "time": "2023-03-08T08:35:38+00:00" } ], "packages-dev": [ @@ -4826,16 +4823,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -4885,9 +4882,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -4903,7 +4900,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -5010,16 +5007,16 @@ }, { "name": "doctrine/annotations", - "version": "1.14.2", + "version": "1.14.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b" + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", "shasum": "" }, "require": { @@ -5080,9 +5077,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.2" + "source": "https://github.com/doctrine/annotations/tree/1.14.3" }, - "time": "2022-12-15T06:48:22+00:00" + "time": "2023-02-01T09:20:38+00:00" }, { "name": "doctrine/instantiator", @@ -5649,16 +5646,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -5713,22 +5710,22 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -5766,7 +5763,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -5774,20 +5771,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -5823,22 +5820,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -5879,9 +5876,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "ondram/ci-detector", @@ -6010,28 +6007,28 @@ }, { "name": "pdepend/pdepend", - "version": "2.12.1", + "version": "2.16.2", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84" + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/7a892d56ceafd804b4a2ecc85184640937ce9e84", - "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58", "shasum": "" }, "require": { "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3|^4|^5|^6.0", - "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0", - "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0" + "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.19" }, "require-dev": { "easy-doc/easy-doc": "0.0.0|^1.2.3", "gregwar/rst": "^1.0", - "phpunit/phpunit": "^4.8.36|^5.7.27", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ @@ -6053,9 +6050,15 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", + "keywords": [ + "PHP Depend", + "PHP_Depend", + "dev", + "pdepend" + ], "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.12.1" + "source": "https://github.com/pdepend/pdepend/tree/2.16.2" }, "funding": [ { @@ -6063,7 +6066,7 @@ "type": "tidelift" } ], - "time": "2022-09-08T19:30:37+00:00" + "time": "2023-12-17T18:09:59+00:00" }, { "name": "phar-io/manifest", @@ -6178,16 +6181,16 @@ }, { "name": "php-censor/phpdoc-checker", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/php-censor/phpdoc-checker.git", - "reference": "57b22c5376431995307271d5f30861e4840f7d0c" + "reference": "3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/57b22c5376431995307271d5f30861e4840f7d0c", - "reference": "57b22c5376431995307271d5f30861e4840f7d0c", + "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4", + "reference": "3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4", "shasum": "" }, "require": { @@ -6198,12 +6201,14 @@ "symfony/console": "^4.4|^5.0" }, "require-dev": { - "jakub-onderka/php-parallel-lint": "^1.0", - "phploc/phploc": "^2.0", + "friendsofphp/php-cs-fixer": "^3.4", + "infection/infection": "^0.25", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phploc/phploc": "^7.0", "phpmd/phpmd": "^2.10", - "phpunit/phpunit": "^7.5", - "sebastian/phpcpd": "^5.0", - "squizlabs/php_codesniffer": "^3.6" + "phpunit/phpunit": "^9.5", + "sebastian/phpcpd": "^6.0", + "vimeo/psalm": "^4.16" }, "bin": [ "bin/phpdoc-checker" @@ -6248,7 +6253,7 @@ "issues": "https://github.com/php-censor/phpdoc-checker/issues", "source": "https://github.com/php-censor/phpdoc-checker" }, - "time": "2022-04-15T15:00:32+00:00" + "time": "2023-10-07T03:44:58+00:00" }, { "name": "php-cs-fixer/diff", @@ -6472,24 +6477,27 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.0", "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13" }, "require-dev": { "ext-tokenizer": "*", + "phpbench/phpbench": "^1.2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", @@ -6521,9 +6529,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" }, - "time": "2022-10-14T12:47:21+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phploc/phploc", @@ -6588,22 +6596,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.13.0", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3" + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0", + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.12.1", + "pdepend/pdepend": "^2.16.1", "php": ">=5.3.9" }, "require-dev": { @@ -6612,8 +6620,7 @@ "ext-simplexml": "*", "gregwar/rst": "^1.0", "mikey179/vfsstream": "^1.6.8", - "phpunit/phpunit": "^4.8.36 || ^5.7.27", - "squizlabs/php_codesniffer": "^2.0" + "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" }, "bin": [ "src/bin/phpmd" @@ -6650,6 +6657,7 @@ "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", "homepage": "https://phpmd.org/", "keywords": [ + "dev", "mess detection", "mess detector", "pdepend", @@ -6659,7 +6667,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.13.0" + "source": "https://github.com/phpmd/phpmd/tree/2.15.0" }, "funding": [ { @@ -6667,32 +6675,33 @@ "type": "tidelift" } ], - "time": "2022-09-10T08:44:15+00:00" + "time": "2023-12-11T08:22:20+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.16.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359" + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", + "doctrine/instantiator": "^1.2 || ^2.0", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" + "phpstan/phpstan": "^1.9", + "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" }, "type": "library", "extra": { @@ -6725,6 +6734,7 @@ "keywords": [ "Double", "Dummy", + "dev", "fake", "mock", "spy", @@ -6732,28 +6742,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.16.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" }, - "time": "2022-11-29T15:06:56+00:00" + "time": "2023-12-07T16:22:33+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.0.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177" + "reference": "29f8114c2c319a4308e6b070902211e062efa392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/2d7a9df55f257d2cba9b1d0c0963a54960657177", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", + "reference": "29f8114c2c319a4308e6b070902211e062efa392", "shasum": "" }, "require": { "php": "^7.3 || ^8", - "phpspec/prophecy": "^1.3", - "phpunit/phpunit": "^9.1" + "phpspec/prophecy": "^1.18", + "phpunit/phpunit": "^9.1 || ^10.1" }, "type": "library", "extra": { @@ -6784,22 +6794,69 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.1" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" + }, + "time": "2023-12-08T12:48:02+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.24.5", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" }, - "time": "2020-07-09T08:33:42+00:00" + "time": "2023-12-16T09:33:33+00:00" }, { "name": "phpstan/phpstan", - "version": "1.8.10", + "version": "1.10.50", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0c4459dc42c568b818b3f25186589f3acddc1823" + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0c4459dc42c568b818b3f25186589f3acddc1823", - "reference": "0c4459dc42c568b818b3f25186589f3acddc1823", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", "shasum": "" }, "require": { @@ -6828,8 +6885,11 @@ "static analysis" ], "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.8.10" + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" }, "funding": [ { @@ -6845,27 +6905,27 @@ "type": "tidelift" } ], - "time": "2022-10-17T14:23:35+00:00" + "time": "2023-12-13T10:59:42+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -6880,8 +6940,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -6914,7 +6974,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -6922,7 +6983,7 @@ "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7167,20 +7228,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -7191,7 +7252,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -7209,8 +7270,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -7218,7 +7279,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -7249,7 +7310,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -7265,30 +7327,29 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "rector/rector", - "version": "0.14.6", + "version": "0.14.8", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "e61574288661334155de6e5f0f45497285abad5d" + "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/e61574288661334155de6e5f0f45497285abad5d", - "reference": "e61574288661334155de6e5f0f45497285abad5d", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/46ee9a173a2b2645ca92a75ffc17460139fa226e", + "reference": "46ee9a173a2b2645ca92a75ffc17460139fa226e", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.8.7" + "phpstan/phpstan": "^1.9.0" }, "conflict": { "rector/rector-doctrine": "*", "rector/rector-downgrade-php": "*", - "rector/rector-laravel": "*", "rector/rector-php-parser": "*", "rector/rector-phpoffice": "*", "rector/rector-phpunit": "*", @@ -7315,7 +7376,7 @@ "description": "Instant Upgrade and Automated Refactoring of any PHP code", "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.14.6" + "source": "https://github.com/rectorphp/rector/tree/0.14.8" }, "funding": [ { @@ -7323,35 +7384,41 @@ "type": "github" } ], - "time": "2022-10-15T22:58:22+00:00" + "time": "2022-11-14T14:09:49+00:00" }, { "name": "sanmai/later", - "version": "0.1.2", + "version": "0.1.4", "source": { "type": "git", "url": "https://github.com/sanmai/later.git", - "reference": "9b659fecef2030193fd02402955bc39629d5606f" + "reference": "e24c4304a4b1349c2a83151a692cec0c10579f60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/later/zipball/9b659fecef2030193fd02402955bc39629d5606f", - "reference": "9b659fecef2030193fd02402955bc39629d5606f", + "url": "https://api.github.com/repos/sanmai/later/zipball/e24c4304a4b1349c2a83151a692cec0c10579f60", + "reference": "e24c4304a4b1349c2a83151a692cec0c10579f60", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.13", - "infection/infection": ">=0.10.5", + "ergebnis/composer-normalize": "^2.8", + "friendsofphp/php-cs-fixer": "^3.35.1", + "infection/infection": ">=0.27.6", "phan/phan": ">=2", "php-coveralls/php-coveralls": "^2.0", - "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": ">=7.4", + "phpstan/phpstan": ">=1.4.5", + "phpunit/phpunit": ">=9.5 <10", "vimeo/psalm": ">=2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, "autoload": { "files": [ "src/functions.php" @@ -7373,7 +7440,7 @@ "description": "Later: deferred wrapper object", "support": { "issues": "https://github.com/sanmai/later/issues", - "source": "https://github.com/sanmai/later/tree/0.1.2" + "source": "https://github.com/sanmai/later/tree/0.1.4" }, "funding": [ { @@ -7381,34 +7448,34 @@ "type": "github" } ], - "time": "2021-01-02T10:26:44+00:00" + "time": "2023-10-24T00:25:28+00:00" }, { "name": "sanmai/pipeline", - "version": "v6.3", + "version": "v6.9", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43" + "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/929b115ca58d62b6b2574702df1ebde4562c7c43", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/c48f45c22c3ce4140d071f7658fb151df1cc08ea", + "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.8", - "friendsofphp/php-cs-fixer": "^3", + "friendsofphp/php-cs-fixer": "^3.17", "infection/infection": ">=0.10.5", - "league/pipeline": "^1.0 || ^0.3", + "league/pipeline": "^0.3 || ^1.0", "phan/phan": ">=1.1", "php-coveralls/php-coveralls": "^2.4.1", "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": "^7.4 || ^8.1 || ^9.4", + "phpunit/phpunit": ">=9.4", "vimeo/psalm": ">=2" }, "type": "library", @@ -7438,7 +7505,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.3" + "source": "https://github.com/sanmai/pipeline/tree/v6.9" }, "funding": [ { @@ -7446,7 +7513,7 @@ "type": "github" } ], - "time": "2022-11-30T06:07:06+00:00" + "time": "2023-10-08T11:56:54+00:00" }, { "name": "sebastian/cli-parser", @@ -7748,16 +7815,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -7799,7 +7866,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -7807,7 +7874,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -7888,16 +7955,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -7940,7 +8007,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -7948,7 +8015,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -8178,20 +8245,21 @@ "type": "github" } ], + "abandoned": true, "time": "2020-12-07T05:39:23+00:00" }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -8230,10 +8298,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -8241,7 +8309,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -8300,16 +8368,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -8344,7 +8412,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -8352,7 +8420,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -8409,16 +8477,16 @@ }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "76d449a358ece77d6f1d6331c68453e657172202" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202", + "reference": "76d449a358ece77d6f1d6331c68453e657172202", "shasum": "" }, "require": { @@ -8445,7 +8513,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "JSON Linter", @@ -8457,7 +8525,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1" }, "funding": [ { @@ -8469,20 +8537,20 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-12-18T13:03:25+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.8.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", "shasum": "" }, "require": { @@ -8492,7 +8560,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/phpcs", @@ -8511,34 +8579,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "standards", + "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2022-06-18T07:21:10+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T12:32:31+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690" + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", "shasum": "" }, "require": { @@ -8578,7 +8670,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.11" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" }, "funding": [ { @@ -8594,20 +8686,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.13", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69" + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", "shasum": "" }, "require": { @@ -8640,7 +8732,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.13" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.21" }, "funding": [ { @@ -8656,7 +8748,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T13:19:49+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/var-dumper", @@ -8888,16 +8980,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -8926,7 +9018,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -8934,7 +9026,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", @@ -9171,5 +9263,5 @@ "ext-bcmath": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From d48274417c94c3e0c7ffa1ddd1354782bed37f61 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 11 Jan 2024 18:43:49 +0700 Subject: [PATCH 193/212] Added changelog for version 2.0.12. --- docs/CHANGELOG_2.0.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/CHANGELOG_2.0.md b/docs/CHANGELOG_2.0.md index c036c8ae6..141cef5ed 100644 --- a/docs/CHANGELOG_2.0.md +++ b/docs/CHANGELOG_2.0.md @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.12 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.12) (2024-01-11) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.11...2.0.12) + +### Fixed + +- Updated dependencies. Fixed: + - `guzzlehttp/psr7` (1.9.0) | CVE-2023-29197: Improper header validation | https://github.com/guzzle/psr7/security/advisories/GHSA-wxmh-65f7-jcvw. + + ## [2.0.11 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.11) (2023-01-11) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.10...2.0.11) From 76d3b63a0bfe634217eb422718bb12bc4316d005 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 11 Jan 2024 19:01:51 +0700 Subject: [PATCH 194/212] Updated README.md versions (+ 2.0.12). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 408dc8b9b..8e90fcc36 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.11` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.12` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | | `2.1` (Mr. Meeseeks) | `2.1.3` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | From de54318ae9af5caaa153f65a87a1bc54dffb8909 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 11 Jan 2024 19:04:37 +0700 Subject: [PATCH 195/212] Added changelog for version 2.1.4 and upgrade VERSION.md for release 2.1.4. --- CHANGELOG.md | 10 + VERSION.md | 2 +- composer.lock | 1050 +++++++++++++++++++++++++++---------------------- 3 files changed, 581 insertions(+), 481 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649c5b98e..64e96cd56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.4 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.4) (2024-01-11) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.3...2.1.4) + +### Fixed + +- Updated dependencies. Fixed: + - `guzzlehttp/psr7` (1.9.0) | CVE-2023-29197: Improper header validation | https://github.com/guzzle/psr7/security/advisories/GHSA-wxmh-65f7-jcvw. + + ## [2.1.3 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.3) (2023-01-11) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.2...2.1.3) diff --git a/VERSION.md b/VERSION.md index ac2cdeba0..7d2ed7c70 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.3 +2.1.4 diff --git a/composer.lock b/composer.lock index 62ff5aa0a..865b1ef75 100644 --- a/composer.lock +++ b/composer.lock @@ -8,22 +8,25 @@ "packages": [ { "name": "cakephp/core", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd" + "reference": "c2f4dff110d41e475d1041f2abe236f1c62d0cd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/20e50de2f461b5983a1a1296fe5c3762857b9edd", - "reference": "20e50de2f461b5983a1a1296fe5c3762857b9edd", + "url": "https://api.github.com/repos/cakephp/core/zipball/c2f4dff110d41e475d1041f2abe236f1c62d0cd0", + "reference": "c2f4dff110d41e475d1041f2abe236f1c62d0cd0", "shasum": "" }, "require": { "cakephp/utility": "^4.0", "php": ">=7.4.0" }, + "provide": { + "psr/container-implementation": "^1.0 || ^2.0" + }, "suggest": { "cakephp/cache": "To use Configure::store() and restore().", "cakephp/event": "To use PluginApplicationInterface or plugin applications.", @@ -61,20 +64,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/core" }, - "time": "2022-10-07T16:40:13+00:00" + "time": "2023-10-21T13:30:46+00:00" }, { "name": "cakephp/database", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c" + "reference": "317739cc32060ef19b6c19c87ac6b64848d78e27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/c12a8f30f802968a885774e2ac3c099f470bf07c", - "reference": "c12a8f30f802968a885774e2ac3c099f470bf07c", + "url": "https://api.github.com/repos/cakephp/database/zipball/317739cc32060ef19b6c19c87ac6b64848d78e27", + "reference": "317739cc32060ef19b6c19c87ac6b64848d78e27", "shasum": "" }, "require": { @@ -117,20 +120,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/database" }, - "time": "2023-01-03T20:29:38+00:00" + "time": "2023-12-07T12:23:54+00:00" }, { "name": "cakephp/datasource", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e" + "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/cb58adb0e6f52f26fa61d03776b07c157e328c1e", - "reference": "cb58adb0e6f52f26fa61d03776b07c157e328c1e", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/5d11a35ffc09dee744faaab7f758aeb42c17cfec", + "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec", "shasum": "" }, "require": { @@ -175,20 +178,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2022-11-26T11:46:41+00:00" + "time": "2023-11-05T07:32:10+00:00" }, { "name": "cakephp/utility", - "version": "4.4.10", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f" + "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/aa7bba6c39b56751f5c917464f113c924d4ba10f", - "reference": "aa7bba6c39b56751f5c917464f113c924d4ba10f", + "url": "https://api.github.com/repos/cakephp/utility/zipball/9fb72974e91e81f1545a15a6d45f50c82cd77def", + "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def", "shasum": "" }, "require": { @@ -234,29 +237,33 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2022-11-06T06:40:44+00:00" + "time": "2023-04-11T21:22:06+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -275,9 +282,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/lexer", @@ -359,16 +366,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "b531a2311709443320c786feb4519cfaf94af796" + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", - "reference": "b531a2311709443320c786feb4519cfaf94af796", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", "shasum": "" }, "require": { @@ -414,7 +421,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.6" }, "funding": [ { @@ -422,7 +429,7 @@ "type": "github" } ], - "time": "2023-01-02T17:26:14+00:00" + "time": "2023-06-01T07:04:22+00:00" }, { "name": "guzzlehttp/guzzle", @@ -541,16 +548,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -560,11 +567,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -605,7 +607,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -621,20 +623,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -653,11 +655,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -715,7 +712,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.0" + "source": "https://github.com/guzzle/psr7/tree/1.9.1" }, "funding": [ { @@ -731,7 +728,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "hipchat/hipchat-php", @@ -883,16 +880,16 @@ }, { "name": "monolog/monolog", - "version": "2.8.0", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -907,7 +904,7 @@ "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", @@ -969,7 +966,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.8.0" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -981,7 +978,7 @@ "type": "tidelift" } ], - "time": "2022-07-24T11:55:47+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "pda/pheanstalk", @@ -1374,25 +1371,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1421,9 +1418,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -1658,16 +1655,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -1712,7 +1709,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -1720,7 +1717,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -1854,16 +1851,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.11", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027" + "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027", - "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ed1f634a36606f2065eec221b3975e05016cbbe", + "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe", "shasum": "" }, "require": { @@ -1906,7 +1903,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.11" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.31" }, "funding": [ { @@ -1922,20 +1919,20 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:05+00:00" + "time": "2023-10-31T07:58:33+00:00" }, { "name": "symfony/cache", - "version": "v5.4.18", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef" + "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a33fa08a3f37bb44b90e60b9028796d6b811f9ef", - "reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef", + "url": "https://api.github.com/repos/symfony/cache/zipball/b17f28169f7a2f2c0cddf2b044d729f5b75efe5a", + "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a", "shasum": "" }, "require": { @@ -1963,7 +1960,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", @@ -2003,7 +2000,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.18" + "source": "https://github.com/symfony/cache/tree/v5.4.34" }, "funding": [ { @@ -2019,7 +2016,7 @@ "type": "tidelift" } ], - "time": "2022-12-29T16:06:09+00:00" + "time": "2023-12-18T14:56:06+00:00" }, { "name": "symfony/cache-contracts", @@ -2102,16 +2099,16 @@ }, { "name": "symfony/config", - "version": "v5.4.11", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "ec79e03125c1d2477e43dde8528535d90cc78379" + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/ec79e03125c1d2477e43dde8528535d90cc78379", - "reference": "ec79e03125c1d2477e43dde8528535d90cc78379", + "url": "https://api.github.com/repos/symfony/config/zipball/dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", "shasum": "" }, "require": { @@ -2161,7 +2158,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.11" + "source": "https://github.com/symfony/config/tree/v5.4.31" }, "funding": [ { @@ -2177,20 +2174,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-11-09T08:22:43+00:00" }, { "name": "symfony/console", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" + "reference": "4b4d8cd118484aa604ec519062113dd87abde18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", + "url": "https://api.github.com/repos/symfony/console/zipball/4b4d8cd118484aa604ec519062113dd87abde18c", + "reference": "4b4d8cd118484aa604ec519062113dd87abde18c", "shasum": "" }, "require": { @@ -2255,12 +2252,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.17" + "source": "https://github.com/symfony/console/tree/v5.4.34" }, "funding": [ { @@ -2276,20 +2273,20 @@ "type": "tidelift" } ], - "time": "2022-12-28T14:15:31+00:00" + "time": "2023-12-08T13:33:03+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4", - "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -2326,7 +2323,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.17" + "source": "https://github.com/symfony/css-selector/tree/v5.4.26" }, "funding": [ { @@ -2342,20 +2339,20 @@ "type": "tidelift" } ], - "time": "2022-12-23T11:40:44+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "58f2988128d2d278280781db037677a32cf720db" + "reference": "75d568165a65fa7d8124869ec7c3a90424352e6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/58f2988128d2d278280781db037677a32cf720db", - "reference": "58f2988128d2d278280781db037677a32cf720db", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/75d568165a65fa7d8124869ec7c3a90424352e6c", + "reference": "75d568165a65fa7d8124869ec7c3a90424352e6c", "shasum": "" }, "require": { @@ -2415,7 +2412,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.17" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.34" }, "funding": [ { @@ -2431,7 +2428,7 @@ "type": "tidelift" } ], - "time": "2022-12-28T13:55:51+00:00" + "time": "2023-12-28T09:31:38+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2502,16 +2499,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b" + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", - "reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201", + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201", "shasum": "" }, "require": { @@ -2557,7 +2554,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.17" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32" }, "funding": [ { @@ -2573,20 +2570,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-11-17T20:43:48+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9" + "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", - "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e3bca343efeb613f843c254e7718ef17c9bdf7a3", + "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3", "shasum": "" }, "require": { @@ -2642,7 +2639,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.34" }, "funding": [ { @@ -2658,7 +2655,7 @@ "type": "tidelift" } ], - "time": "2022-12-12T15:54:21+00:00" + "time": "2023-12-27T21:12:56+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2741,16 +2738,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.13", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51" + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", "shasum": "" }, "require": { @@ -2785,7 +2782,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.13" + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" }, "funding": [ { @@ -2801,20 +2798,20 @@ "type": "tidelift" } ], - "time": "2022-09-21T19:53:16+00:00" + "time": "2023-05-31T13:04:02+00:00" }, { "name": "symfony/finder", - "version": "v5.4.17", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc" + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", "shasum": "" }, "require": { @@ -2848,7 +2845,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.17" + "source": "https://github.com/symfony/finder/tree/v5.4.27" }, "funding": [ { @@ -2864,20 +2861,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-07-31T08:02:31+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a" + "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a", - "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4da1713e88cf9c44bd4bf65f54772681222fcbec", + "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec", "shasum": "" }, "require": { @@ -2924,7 +2921,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.17" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.34" }, "funding": [ { @@ -2940,24 +2937,24 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:23:03+00:00" + "time": "2023-12-27T11:45:35+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c" + "reference": "0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/fd816412b76447890efedaf9ddfe8632589ce10c", - "reference": "fd816412b76447890efedaf9ddfe8632589ce10c", + "url": "https://api.github.com/repos/symfony/mailer/zipball/0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5", + "reference": "0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5", "shasum": "" }, "require": { - "egulias/email-validator": "^2.1.10|^3", + "egulias/email-validator": "^2.1.10|^3|^4", "php": ">=7.2.5", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", @@ -2971,7 +2968,7 @@ "symfony/http-kernel": "<4.4" }, "require-dev": { - "symfony/http-client-contracts": "^1.1|^2|^3", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/messenger": "^4.4|^5.0|^6.0" }, "type": "library", @@ -3000,7 +2997,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.17" + "source": "https://github.com/symfony/mailer/tree/v5.4.34" }, "funding": [ { @@ -3016,20 +3013,20 @@ "type": "tidelift" } ], - "time": "2022-12-14T15:45:23+00:00" + "time": "2023-12-02T08:41:43+00:00" }, { "name": "symfony/mime", - "version": "v5.4.17", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63" + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63", - "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63", + "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", "shasum": "" }, "require": { @@ -3044,15 +3041,15 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" }, "type": "library", "autoload": { @@ -3084,7 +3081,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.17" + "source": "https://github.com/symfony/mime/tree/v5.4.26" }, "funding": [ { @@ -3100,20 +3097,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:59:55+00:00" + "time": "2023-07-27T06:29:31+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -3128,7 +3125,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3166,7 +3163,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3182,20 +3179,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "927013f3aac555983a5059aada98e1907d842695" + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -3210,7 +3207,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3249,7 +3246,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" }, "funding": [ { @@ -3265,20 +3262,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -3290,7 +3287,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3330,7 +3327,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -3346,20 +3343,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -3373,7 +3370,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3417,7 +3414,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -3433,20 +3430,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -3458,7 +3455,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3501,7 +3498,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -3517,20 +3514,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -3545,7 +3542,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3584,7 +3581,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -3600,20 +3597,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -3622,7 +3619,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3660,7 +3657,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -3676,20 +3673,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -3698,7 +3695,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3739,7 +3736,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -3755,20 +3752,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -3777,7 +3774,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3822,7 +3819,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -3838,20 +3835,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -3860,7 +3857,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3901,7 +3898,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -3917,20 +3914,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v5.4.11", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1" + "reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1", - "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1", + "url": "https://api.github.com/repos/symfony/process/zipball/8fa22178dfc368911dbd513b431cd9b06f9afe7a", + "reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a", "shasum": "" }, "require": { @@ -3963,7 +3960,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.11" + "source": "https://github.com/symfony/process/tree/v5.4.34" }, "funding": [ { @@ -3979,7 +3976,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2023-12-02T08:41:43+00:00" }, { "name": "symfony/service-contracts", @@ -4066,16 +4063,16 @@ }, { "name": "symfony/string", - "version": "v5.4.17", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b" + "reference": "e3f98bfc7885c957488f443df82d97814a3ce061" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b", + "url": "https://api.github.com/repos/symfony/string/zipball/e3f98bfc7885c957488f443df82d97814a3ce061", + "reference": "e3f98bfc7885c957488f443df82d97814a3ce061", "shasum": "" }, "require": { @@ -4132,7 +4129,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.17" + "source": "https://github.com/symfony/string/tree/v5.4.34" }, "funding": [ { @@ -4148,20 +4145,20 @@ "type": "tidelift" } ], - "time": "2022-12-12T15:54:21+00:00" + "time": "2023-12-09T13:20:28+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.17", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff" + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2adac0a9b55f9fb40b983b790509581dc3db0fff", - "reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add", + "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add", "shasum": "" }, "require": { @@ -4205,7 +4202,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.17" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.32" }, "funding": [ { @@ -4221,20 +4218,20 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:10:04+00:00" + "time": "2023-11-16T19:33:05+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.17", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e" + "reference": "f387675d7f5fc4231f7554baa70681f222f73563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/edcdc11498108f8967fe95118a7ec8624b94760e", - "reference": "edcdc11498108f8967fe95118a7ec8624b94760e", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563", + "reference": "f387675d7f5fc4231f7554baa70681f222f73563", "shasum": "" }, "require": { @@ -4280,7 +4277,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.17" + "source": "https://github.com/symfony/yaml/tree/v5.4.31" }, "funding": [ { @@ -4296,20 +4293,20 @@ "type": "tidelift" } ], - "time": "2022-12-13T09:57:04+00:00" + "time": "2023-11-03T14:41:28+00:00" }, { "name": "voku/anti-xss", - "version": "4.1.39", + "version": "4.1.42", "source": { "type": "git", "url": "https://github.com/voku/anti-xss.git", - "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0" + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/anti-xss/zipball/64a59ba4744e6722866ff3440d93561da9e85cd0", - "reference": "64a59ba4744e6722866ff3440d93561da9e85cd0", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675", + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675", "shasum": "" }, "require": { @@ -4355,7 +4352,7 @@ ], "support": { "issues": "https://github.com/voku/anti-xss/issues", - "source": "https://github.com/voku/anti-xss/tree/4.1.39" + "source": "https://github.com/voku/anti-xss/tree/4.1.42" }, "funding": [ { @@ -4379,7 +4376,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:58+00:00" + "time": "2023-07-03T14:40:46+00:00" }, { "name": "voku/portable-ascii", @@ -4457,16 +4454,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.12", + "version": "6.0.13", "source": { "type": "git", "url": "https://github.com/voku/portable-utf8.git", - "reference": "db0583727bb17666bbd2ba238c85babb973fd165" + "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/db0583727bb17666bbd2ba238c85babb973fd165", - "reference": "db0583727bb17666bbd2ba238c85babb973fd165", + "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", + "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", "shasum": "" }, "require": { @@ -4532,7 +4529,7 @@ ], "support": { "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.12" + "source": "https://github.com/voku/portable-utf8/tree/6.0.13" }, "funding": [ { @@ -4556,7 +4553,7 @@ "type": "tidelift" } ], - "time": "2023-01-11T12:26:16+00:00" + "time": "2023-03-08T08:35:38+00:00" } ], "packages-dev": [ @@ -4872,16 +4869,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -4931,9 +4928,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -4949,7 +4946,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -5056,16 +5053,16 @@ }, { "name": "doctrine/annotations", - "version": "1.14.2", + "version": "1.14.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b" + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b", - "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", "shasum": "" }, "require": { @@ -5126,9 +5123,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.2" + "source": "https://github.com/doctrine/annotations/tree/1.14.3" }, - "time": "2022-12-15T06:48:22+00:00" + "time": "2023-02-01T09:20:38+00:00" }, { "name": "doctrine/instantiator", @@ -5695,16 +5692,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -5759,22 +5756,22 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -5812,7 +5809,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -5820,20 +5817,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -5869,22 +5866,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -5925,9 +5922,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "ondram/ci-detector", @@ -6056,28 +6053,28 @@ }, { "name": "pdepend/pdepend", - "version": "2.12.1", + "version": "2.16.2", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84" + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/7a892d56ceafd804b4a2ecc85184640937ce9e84", - "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58", "shasum": "" }, "require": { "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3|^4|^5|^6.0", - "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0", - "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0" + "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.19" }, "require-dev": { "easy-doc/easy-doc": "0.0.0|^1.2.3", "gregwar/rst": "^1.0", - "phpunit/phpunit": "^4.8.36|^5.7.27", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ @@ -6099,9 +6096,15 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", + "keywords": [ + "PHP Depend", + "PHP_Depend", + "dev", + "pdepend" + ], "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.12.1" + "source": "https://github.com/pdepend/pdepend/tree/2.16.2" }, "funding": [ { @@ -6109,7 +6112,7 @@ "type": "tidelift" } ], - "time": "2022-09-08T19:30:37+00:00" + "time": "2023-12-17T18:09:59+00:00" }, { "name": "phar-io/manifest", @@ -6224,16 +6227,16 @@ }, { "name": "php-censor/phpdoc-checker", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/php-censor/phpdoc-checker.git", - "reference": "57b22c5376431995307271d5f30861e4840f7d0c" + "reference": "3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/57b22c5376431995307271d5f30861e4840f7d0c", - "reference": "57b22c5376431995307271d5f30861e4840f7d0c", + "url": "https://api.github.com/repos/php-censor/phpdoc-checker/zipball/3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4", + "reference": "3144553b7a2c2c30fdd82e0acf8d6d6f613a0fa4", "shasum": "" }, "require": { @@ -6244,12 +6247,14 @@ "symfony/console": "^4.4|^5.0" }, "require-dev": { - "jakub-onderka/php-parallel-lint": "^1.0", - "phploc/phploc": "^2.0", + "friendsofphp/php-cs-fixer": "^3.4", + "infection/infection": "^0.25", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phploc/phploc": "^7.0", "phpmd/phpmd": "^2.10", - "phpunit/phpunit": "^7.5", - "sebastian/phpcpd": "^5.0", - "squizlabs/php_codesniffer": "^3.6" + "phpunit/phpunit": "^9.5", + "sebastian/phpcpd": "^6.0", + "vimeo/psalm": "^4.16" }, "bin": [ "bin/phpdoc-checker" @@ -6294,7 +6299,7 @@ "issues": "https://github.com/php-censor/phpdoc-checker/issues", "source": "https://github.com/php-censor/phpdoc-checker" }, - "time": "2022-04-15T15:00:32+00:00" + "time": "2023-10-07T03:44:58+00:00" }, { "name": "php-cs-fixer/diff", @@ -6518,24 +6523,27 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.2", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.0", "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13" }, "require-dev": { "ext-tokenizer": "*", + "phpbench/phpbench": "^1.2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", @@ -6567,9 +6575,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2022-10-14T12:47:21+00:00" + "time": "2024-01-11T11:49:22+00:00" }, { "name": "phploc/phploc", @@ -6634,22 +6642,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.13.0", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3" + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0", + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.12.1", + "pdepend/pdepend": "^2.16.1", "php": ">=5.3.9" }, "require-dev": { @@ -6658,8 +6666,7 @@ "ext-simplexml": "*", "gregwar/rst": "^1.0", "mikey179/vfsstream": "^1.6.8", - "phpunit/phpunit": "^4.8.36 || ^5.7.27", - "squizlabs/php_codesniffer": "^2.0" + "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" }, "bin": [ "src/bin/phpmd" @@ -6696,6 +6703,7 @@ "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", "homepage": "https://phpmd.org/", "keywords": [ + "dev", "mess detection", "mess detector", "pdepend", @@ -6705,7 +6713,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.13.0" + "source": "https://github.com/phpmd/phpmd/tree/2.15.0" }, "funding": [ { @@ -6713,32 +6721,33 @@ "type": "tidelift" } ], - "time": "2022-09-10T08:44:15+00:00" + "time": "2023-12-11T08:22:20+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.16.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359" + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359", - "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", + "doctrine/instantiator": "^1.2 || ^2.0", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" + "phpstan/phpstan": "^1.9", + "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" }, "type": "library", "extra": { @@ -6771,6 +6780,7 @@ "keywords": [ "Double", "Dummy", + "dev", "fake", "mock", "spy", @@ -6778,28 +6788,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.16.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" }, - "time": "2022-11-29T15:06:56+00:00" + "time": "2023-12-07T16:22:33+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.0.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177" + "reference": "29f8114c2c319a4308e6b070902211e062efa392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/2d7a9df55f257d2cba9b1d0c0963a54960657177", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", + "reference": "29f8114c2c319a4308e6b070902211e062efa392", "shasum": "" }, "require": { "php": "^7.3 || ^8", - "phpspec/prophecy": "^1.3", - "phpunit/phpunit": "^9.1" + "phpspec/prophecy": "^1.18", + "phpunit/phpunit": "^9.1 || ^10.1" }, "type": "library", "extra": { @@ -6830,29 +6840,76 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.1" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" }, - "time": "2020-07-09T08:33:42+00:00" + "time": "2023-12-08T12:48:02+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.25.0", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + }, + "time": "2024-01-04T17:06:16+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -6867,8 +6924,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -6901,7 +6958,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -6909,7 +6967,7 @@ "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7154,20 +7212,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -7178,7 +7236,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -7196,8 +7254,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -7205,7 +7263,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -7236,7 +7294,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -7252,35 +7311,41 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "sanmai/later", - "version": "0.1.2", + "version": "0.1.4", "source": { "type": "git", "url": "https://github.com/sanmai/later.git", - "reference": "9b659fecef2030193fd02402955bc39629d5606f" + "reference": "e24c4304a4b1349c2a83151a692cec0c10579f60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/later/zipball/9b659fecef2030193fd02402955bc39629d5606f", - "reference": "9b659fecef2030193fd02402955bc39629d5606f", + "url": "https://api.github.com/repos/sanmai/later/zipball/e24c4304a4b1349c2a83151a692cec0c10579f60", + "reference": "e24c4304a4b1349c2a83151a692cec0c10579f60", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.13", - "infection/infection": ">=0.10.5", + "ergebnis/composer-normalize": "^2.8", + "friendsofphp/php-cs-fixer": "^3.35.1", + "infection/infection": ">=0.27.6", "phan/phan": ">=2", "php-coveralls/php-coveralls": "^2.0", - "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": ">=7.4", + "phpstan/phpstan": ">=1.4.5", + "phpunit/phpunit": ">=9.5 <10", "vimeo/psalm": ">=2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, "autoload": { "files": [ "src/functions.php" @@ -7302,7 +7367,7 @@ "description": "Later: deferred wrapper object", "support": { "issues": "https://github.com/sanmai/later/issues", - "source": "https://github.com/sanmai/later/tree/0.1.2" + "source": "https://github.com/sanmai/later/tree/0.1.4" }, "funding": [ { @@ -7310,34 +7375,34 @@ "type": "github" } ], - "time": "2021-01-02T10:26:44+00:00" + "time": "2023-10-24T00:25:28+00:00" }, { "name": "sanmai/pipeline", - "version": "v6.3", + "version": "v6.9", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43" + "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/929b115ca58d62b6b2574702df1ebde4562c7c43", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/c48f45c22c3ce4140d071f7658fb151df1cc08ea", + "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.8", - "friendsofphp/php-cs-fixer": "^3", + "friendsofphp/php-cs-fixer": "^3.17", "infection/infection": ">=0.10.5", - "league/pipeline": "^1.0 || ^0.3", + "league/pipeline": "^0.3 || ^1.0", "phan/phan": ">=1.1", "php-coveralls/php-coveralls": "^2.4.1", "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": "^7.4 || ^8.1 || ^9.4", + "phpunit/phpunit": ">=9.4", "vimeo/psalm": ">=2" }, "type": "library", @@ -7367,7 +7432,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.3" + "source": "https://github.com/sanmai/pipeline/tree/v6.9" }, "funding": [ { @@ -7375,7 +7440,7 @@ "type": "github" } ], - "time": "2022-11-30T06:07:06+00:00" + "time": "2023-10-08T11:56:54+00:00" }, { "name": "sebastian/cli-parser", @@ -7620,20 +7685,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -7665,7 +7730,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -7673,20 +7738,20 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -7728,7 +7793,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -7736,7 +7801,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -7817,16 +7882,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -7869,7 +7934,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -7877,24 +7942,24 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -7926,7 +7991,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -7934,7 +7999,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -8107,20 +8172,21 @@ "type": "github" } ], + "abandoned": true, "time": "2020-12-07T05:39:23+00:00" }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -8159,10 +8225,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -8170,7 +8236,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -8229,16 +8295,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -8273,7 +8339,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -8281,7 +8347,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -8338,16 +8404,16 @@ }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "76d449a358ece77d6f1d6331c68453e657172202" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202", + "reference": "76d449a358ece77d6f1d6331c68453e657172202", "shasum": "" }, "require": { @@ -8374,7 +8440,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "JSON Linter", @@ -8386,7 +8452,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1" }, "funding": [ { @@ -8398,20 +8464,20 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-12-18T13:03:25+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.8.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", "shasum": "" }, "require": { @@ -8421,7 +8487,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/phpcs", @@ -8440,34 +8506,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "standards", + "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2022-06-18T07:21:10+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T12:32:31+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.11", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690" + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690", - "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", "shasum": "" }, "require": { @@ -8507,7 +8597,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.11" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" }, "funding": [ { @@ -8523,20 +8613,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.13", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69" + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69", - "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", "shasum": "" }, "require": { @@ -8569,7 +8659,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.13" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.21" }, "funding": [ { @@ -8585,7 +8675,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T13:19:49+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/var-dumper", @@ -8817,16 +8907,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -8855,7 +8945,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -8863,7 +8953,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", @@ -9100,5 +9190,5 @@ "ext-bcmath": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From fd7b769bcade80dfe649ed6f4dabe7749ec3839c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Thu, 11 Jan 2024 19:14:53 +0700 Subject: [PATCH 196/212] Updated README.md versions (+ 2.1.4). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e90fcc36..c74a4c9de 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ PHP Censor versions: | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `2.0` (Rick Sanchez) | `2.0.12` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.3` | `release-2.1` | Current stable version | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.4` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From 7aefbddd37ee1992c7aa5403784fffecd80b7d7e Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 4 May 2024 18:02:00 +0700 Subject: [PATCH 197/212] Added changelog for version 2.1.5 and upgrade VERSION.md for release 2.1.5. --- CHANGELOG.md | 13 + VERSION.md | 2 +- composer.lock | 835 +++++++++++++-------------- docs/CHANGELOG_2.0.md | 13 + src/Controller/SessionController.php | 2 +- 5 files changed, 437 insertions(+), 428 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64e96cd56..0722ed41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.5 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.5) (2024-05-04) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.4...2.1.5) + +### Added + +- Support of PHP 8.2 and 8.3 in GitHub Actions. + +### Fixed + +- Security issue with remember me key in auth. See: https://chmod744.super.site/redacted-vulnerability. + + ## [2.1.4 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.4) (2024-01-11) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.3...2.1.4) diff --git a/VERSION.md b/VERSION.md index 7d2ed7c70..cd57a8b95 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.4 +2.1.5 diff --git a/composer.lock b/composer.lock index 865b1ef75..fe4de6151 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.5.2", + "version": "4.5.5", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -68,7 +68,7 @@ }, { "name": "cakephp/database", - "version": "4.5.2", + "version": "4.5.5", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", @@ -124,7 +124,7 @@ }, { "name": "cakephp/datasource", - "version": "4.5.2", + "version": "4.5.5", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", @@ -182,16 +182,16 @@ }, { "name": "cakephp/utility", - "version": "4.5.2", + "version": "4.5.5", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def" + "reference": "24bd34c596cd88a69a7d5a338296ffe3c4fd393a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/9fb72974e91e81f1545a15a6d45f50c82cd77def", - "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def", + "url": "https://api.github.com/repos/cakephp/utility/zipball/24bd34c596cd88a69a7d5a338296ffe3c4fd393a", + "reference": "24bd34c596cd88a69a7d5a338296ffe3c4fd393a", "shasum": "" }, "require": { @@ -237,20 +237,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2023-04-11T21:22:06+00:00" + "time": "2024-02-27T16:19:58+00:00" }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -282,22 +282,22 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/lexer", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", "shasum": "" }, "require": { @@ -305,11 +305,11 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", + "doctrine/coding-standard": "^9 || ^12", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" + "vimeo/psalm": "^4.11 || ^5.21" }, "type": "library", "autoload": { @@ -346,7 +346,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" + "source": "https://github.com/doctrine/lexer/tree/2.1.1" }, "funding": [ { @@ -362,7 +362,7 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:49:07+00:00" + "time": "2024-02-05T11:35:39+00:00" }, { "name": "egulias/email-validator", @@ -880,16 +880,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.2", + "version": "2.9.3", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215", + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215", "shasum": "" }, "require": { @@ -910,8 +910,8 @@ "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^8.5.38 || ^9.6.19", "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", @@ -966,7 +966,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + "source": "https://github.com/Seldaek/monolog/tree/2.9.3" }, "funding": [ { @@ -978,20 +978,20 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:25:26+00:00" + "time": "2024-04-12T20:52:51+00:00" }, { "name": "pda/pheanstalk", - "version": "v4.0.4", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/pheanstalk/pheanstalk.git", - "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4" + "reference": "1459f2f62dddfe28902e0584708417dddd79bd70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/1a43eb97a53144a2e692bce2ea2be721cc9913a4", - "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4", + "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/1459f2f62dddfe28902e0584708417dddd79bd70", + "reference": "1459f2f62dddfe28902e0584708417dddd79bd70", "shasum": "" }, "require": { @@ -1031,9 +1031,9 @@ ], "support": { "issues": "https://github.com/pheanstalk/pheanstalk/issues", - "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.4" + "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.5" }, - "time": "2021-11-19T15:00:20+00:00" + "time": "2024-01-11T15:06:06+00:00" }, { "name": "php-censor/common", @@ -1655,16 +1655,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -1709,7 +1709,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -1717,7 +1717,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sensiolabs/ansi-to-html", @@ -1851,16 +1851,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.31", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe" + "reference": "4c5d1a88ceee2b1c5c0b400b0137989ec34f70fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ed1f634a36606f2065eec221b3975e05016cbbe", - "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/4c5d1a88ceee2b1c5c0b400b0137989ec34f70fa", + "reference": "4c5d1a88ceee2b1c5c0b400b0137989ec34f70fa", "shasum": "" }, "require": { @@ -1903,7 +1903,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.31" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.39" }, "funding": [ { @@ -1919,20 +1919,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T07:58:33+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/cache", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a" + "reference": "982237e35079fdcc31ab724f06b6131992c4fd24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/b17f28169f7a2f2c0cddf2b044d729f5b75efe5a", - "reference": "b17f28169f7a2f2c0cddf2b044d729f5b75efe5a", + "url": "https://api.github.com/repos/symfony/cache/zipball/982237e35079fdcc31ab724f06b6131992c4fd24", + "reference": "982237e35079fdcc31ab724f06b6131992c4fd24", "shasum": "" }, "require": { @@ -2000,7 +2000,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.34" + "source": "https://github.com/symfony/cache/tree/v5.4.39" }, "funding": [ { @@ -2016,20 +2016,20 @@ "type": "tidelift" } ], - "time": "2023-12-18T14:56:06+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/cache-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc" + "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", - "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/fee6db04d913094e2fb55ff8e7db5685a8134463", + "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463", "shasum": "" }, "require": { @@ -2079,7 +2079,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.3" }, "funding": [ { @@ -2095,20 +2095,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/config", - "version": "v5.4.31", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9" + "reference": "62cec4a067931552624a9962002c210c502d42fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", - "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", + "url": "https://api.github.com/repos/symfony/config/zipball/62cec4a067931552624a9962002c210c502d42fd", + "reference": "62cec4a067931552624a9962002c210c502d42fd", "shasum": "" }, "require": { @@ -2158,7 +2158,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.31" + "source": "https://github.com/symfony/config/tree/v5.4.39" }, "funding": [ { @@ -2174,20 +2174,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:22:43+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/console", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4b4d8cd118484aa604ec519062113dd87abde18c" + "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4b4d8cd118484aa604ec519062113dd87abde18c", - "reference": "4b4d8cd118484aa604ec519062113dd87abde18c", + "url": "https://api.github.com/repos/symfony/console/zipball/f3e591c48688a0cfa1a3296205926c05e84b22b1", + "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1", "shasum": "" }, "require": { @@ -2257,7 +2257,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.34" + "source": "https://github.com/symfony/console/tree/v5.4.39" }, "funding": [ { @@ -2273,20 +2273,20 @@ "type": "tidelift" } ], - "time": "2023-12-08T13:33:03+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.26", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" + "reference": "0934c9f1d433776f25c629bdc93f3e157d139e08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", - "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0934c9f1d433776f25c629bdc93f3e157d139e08", + "reference": "0934c9f1d433776f25c629bdc93f3e157d139e08", "shasum": "" }, "require": { @@ -2323,7 +2323,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.26" + "source": "https://github.com/symfony/css-selector/tree/v5.4.39" }, "funding": [ { @@ -2339,20 +2339,20 @@ "type": "tidelift" } ], - "time": "2023-07-07T06:10:25+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "75d568165a65fa7d8124869ec7c3a90424352e6c" + "reference": "5b4505f2afbe1d11d43a3917d0c1c178a38f6f19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/75d568165a65fa7d8124869ec7c3a90424352e6c", - "reference": "75d568165a65fa7d8124869ec7c3a90424352e6c", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5b4505f2afbe1d11d43a3917d0c1c178a38f6f19", + "reference": "5b4505f2afbe1d11d43a3917d0c1c178a38f6f19", "shasum": "" }, "require": { @@ -2412,7 +2412,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.34" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.39" }, "funding": [ { @@ -2428,20 +2428,20 @@ "type": "tidelift" } ], - "time": "2023-12-28T09:31:38+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "80d075412b557d41002320b96a096ca65aa2c98d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d", "shasum": "" }, "require": { @@ -2479,7 +2479,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" }, "funding": [ { @@ -2495,20 +2495,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-01-24T14:02:46+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.4.32", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201" + "reference": "1dffb111b038412b028caba029240e379fda85b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201", - "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1dffb111b038412b028caba029240e379fda85b2", + "reference": "1dffb111b038412b028caba029240e379fda85b2", "shasum": "" }, "require": { @@ -2554,7 +2554,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.39" }, "funding": [ { @@ -2570,20 +2570,20 @@ "type": "tidelift" } ], - "time": "2023-11-17T20:43:48+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3" + "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e3bca343efeb613f843c254e7718ef17c9bdf7a3", - "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d40fae9fd85c762b6ba378152fdd1157a85d7e4f", + "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f", "shasum": "" }, "require": { @@ -2639,7 +2639,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.34" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.39" }, "funding": [ { @@ -2655,20 +2655,20 @@ "type": "tidelift" } ], - "time": "2023-12-27T21:12:56+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/540f4c73e87fd0c71ca44a6aa305d024ac68cb73", + "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73", "shasum": "" }, "require": { @@ -2718,7 +2718,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.3" }, "funding": [ { @@ -2734,27 +2734,28 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.25", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/e6edd875d5d39b03de51f3c3951148cfa79a4d12", + "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-php80": "^1.16", + "symfony/process": "^5.4|^6.4" }, "type": "library", "autoload": { @@ -2782,7 +2783,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + "source": "https://github.com/symfony/filesystem/tree/v5.4.39" }, "funding": [ { @@ -2798,20 +2799,20 @@ "type": "tidelift" } ], - "time": "2023-05-31T13:04:02+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/finder", - "version": "v5.4.27", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" + "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", - "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "url": "https://api.github.com/repos/symfony/finder/zipball/f6a96e4fcd468a25fede16ee665f50ced856bd0a", + "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a", "shasum": "" }, "require": { @@ -2845,7 +2846,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.27" + "source": "https://github.com/symfony/finder/tree/v5.4.39" }, "funding": [ { @@ -2861,20 +2862,20 @@ "type": "tidelift" } ], - "time": "2023-07-31T08:02:31+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec" + "reference": "3356c93efc30b0c85a37606bdfef16b813faec0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4da1713e88cf9c44bd4bf65f54772681222fcbec", - "reference": "4da1713e88cf9c44bd4bf65f54772681222fcbec", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3356c93efc30b0c85a37606bdfef16b813faec0e", + "reference": "3356c93efc30b0c85a37606bdfef16b813faec0e", "shasum": "" }, "require": { @@ -2921,7 +2922,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.34" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.39" }, "funding": [ { @@ -2937,20 +2938,20 @@ "type": "tidelift" } ], - "time": "2023-12-27T11:45:35+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5" + "reference": "93543ff1554d1098b0f80bb01ff27e9da123af5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5", - "reference": "0d2c0e0fdd07c80d95eadcdbba6af41e9aafcfa5", + "url": "https://api.github.com/repos/symfony/mailer/zipball/93543ff1554d1098b0f80bb01ff27e9da123af5c", + "reference": "93543ff1554d1098b0f80bb01ff27e9da123af5c", "shasum": "" }, "require": { @@ -2997,7 +2998,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.34" + "source": "https://github.com/symfony/mailer/tree/v5.4.39" }, "funding": [ { @@ -3013,20 +3014,20 @@ "type": "tidelift" } ], - "time": "2023-12-02T08:41:43+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/mime", - "version": "v5.4.26", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" + "reference": "a5364f016fd9e090f7b4f250a97ea6925a5ca985" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", - "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "url": "https://api.github.com/repos/symfony/mime/zipball/a5364f016fd9e090f7b4f250a97ea6925a5ca985", + "reference": "a5364f016fd9e090f7b4f250a97ea6925a5ca985", "shasum": "" }, "require": { @@ -3041,15 +3042,16 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" + "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/process": "^5.4|^6.4", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3" }, "type": "library", "autoload": { @@ -3081,7 +3083,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.26" + "source": "https://github.com/symfony/mime/tree/v5.4.39" }, "funding": [ { @@ -3097,20 +3099,20 @@ "type": "tidelift" } ], - "time": "2023-07-27T06:29:31+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -3124,9 +3126,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3163,7 +3162,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -3179,20 +3178,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", "shasum": "" }, "require": { @@ -3206,9 +3205,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3246,7 +3242,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.29.0" }, "funding": [ { @@ -3262,20 +3258,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -3286,9 +3282,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3327,7 +3320,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -3343,20 +3336,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" + "reference": "a287ed7475f85bf6f61890146edbc932c0fff919" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", + "reference": "a287ed7475f85bf6f61890146edbc932c0fff919", "shasum": "" }, "require": { @@ -3369,9 +3362,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3414,7 +3404,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" }, "funding": [ { @@ -3430,20 +3420,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:30:37+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -3454,9 +3444,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3498,7 +3485,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -3514,20 +3501,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -3541,9 +3528,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3581,7 +3565,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -3597,20 +3581,20 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", "shasum": "" }, "require": { @@ -3618,9 +3602,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3657,7 +3638,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" }, "funding": [ { @@ -3673,20 +3654,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", "shasum": "" }, "require": { @@ -3694,9 +3675,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3736,7 +3714,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" }, "funding": [ { @@ -3752,20 +3730,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -3773,9 +3751,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3819,7 +3794,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -3835,20 +3810,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", "shasum": "" }, "require": { @@ -3856,9 +3831,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3898,7 +3870,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" }, "funding": [ { @@ -3914,20 +3886,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a" + "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8fa22178dfc368911dbd513b431cd9b06f9afe7a", - "reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a", + "url": "https://api.github.com/repos/symfony/process/zipball/85a554acd7c28522241faf2e97b9541247a0d3d5", + "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5", "shasum": "" }, "require": { @@ -3960,7 +3932,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.34" + "source": "https://github.com/symfony/process/tree/v5.4.39" }, "funding": [ { @@ -3976,20 +3948,20 @@ "type": "tidelift" } ], - "time": "2023-12-02T08:41:43+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3", + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3", "shasum": "" }, "require": { @@ -4043,7 +4015,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.3" }, "funding": [ { @@ -4059,20 +4031,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-04-21T15:04:16+00:00" }, { "name": "symfony/string", - "version": "v5.4.34", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e3f98bfc7885c957488f443df82d97814a3ce061" + "reference": "495e71bae5862308051b9e63cc3e34078eed83ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e3f98bfc7885c957488f443df82d97814a3ce061", - "reference": "e3f98bfc7885c957488f443df82d97814a3ce061", + "url": "https://api.github.com/repos/symfony/string/zipball/495e71bae5862308051b9e63cc3e34078eed83ef", + "reference": "495e71bae5862308051b9e63cc3e34078eed83ef", "shasum": "" }, "require": { @@ -4129,7 +4101,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.34" + "source": "https://github.com/symfony/string/tree/v5.4.39" }, "funding": [ { @@ -4145,20 +4117,20 @@ "type": "tidelift" } ], - "time": "2023-12-09T13:20:28+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.32", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add" + "reference": "e85a27cfdbb48e5e9a2d4a5f04efa359857771fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add", - "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/e85a27cfdbb48e5e9a2d4a5f04efa359857771fd", + "reference": "e85a27cfdbb48e5e9a2d4a5f04efa359857771fd", "shasum": "" }, "require": { @@ -4202,7 +4174,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.32" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.39" }, "funding": [ { @@ -4218,20 +4190,20 @@ "type": "tidelift" } ], - "time": "2023-11-16T19:33:05+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.31", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f387675d7f5fc4231f7554baa70681f222f73563" + "reference": "bc780e16879000f77a1022163c052f5323b5e640" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563", - "reference": "f387675d7f5fc4231f7554baa70681f222f73563", + "url": "https://api.github.com/repos/symfony/yaml/zipball/bc780e16879000f77a1022163c052f5323b5e640", + "reference": "bc780e16879000f77a1022163c052f5323b5e640", "shasum": "" }, "require": { @@ -4277,7 +4249,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.31" + "source": "https://github.com/symfony/yaml/tree/v5.4.39" }, "funding": [ { @@ -4293,7 +4265,7 @@ "type": "tidelift" } ], - "time": "2023-11-03T14:41:28+00:00" + "time": "2024-04-23T11:57:27+00:00" }, { "name": "voku/anti-xss", @@ -4559,16 +4531,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -4580,8 +4552,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -4636,7 +4608,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -4644,20 +4616,20 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -4673,11 +4645,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -4701,7 +4668,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -4711,9 +4678,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -4721,7 +4687,7 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "composer/package-versions-deprecated", @@ -5821,16 +5787,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -5841,7 +5807,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -5866,27 +5832,27 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -5922,9 +5888,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "ondram/ci-detector", @@ -6116,20 +6082,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -6170,9 +6137,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -6356,16 +6329,16 @@ }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + "reference": "6db563514f27e19595a19f45a4bf757b6401194e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", + "reference": "6db563514f27e19595a19f45a4bf757b6401194e", "shasum": "" }, "require": { @@ -6403,13 +6376,17 @@ "email": "ahoj@jakubonderka.cz" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "keywords": [ + "lint", + "static analysis" + ], "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" }, - "time": "2022-02-21T12:50:22+00:00" + "time": "2024-03-27T12:14:49+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -6466,28 +6443,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -6511,33 +6495,33 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-04-09T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -6575,9 +6559,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phploc/phploc", @@ -6725,24 +6709,24 @@ }, { "name": "phpspec/prophecy", - "version": "v1.18.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", @@ -6788,33 +6772,33 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" }, - "time": "2023-12-07T16:22:33+00:00" + "time": "2024-02-29T11:52:51+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "29f8114c2c319a4308e6b070902211e062efa392" + "reference": "16e1247e139434bce0bac09848bc5c8d882940fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", - "reference": "29f8114c2c319a4308e6b070902211e062efa392", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/16e1247e139434bce0bac09848bc5c8d882940fc", + "reference": "16e1247e139434bce0bac09848bc5c8d882940fc", "shasum": "" }, "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit": "^9.1 || ^10.1" + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -6840,22 +6824,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.2.0" }, - "time": "2023-12-08T12:48:02+00:00" + "time": "2024-03-01T08:33:58+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", "shasum": "" }, "require": { @@ -6887,22 +6871,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" }, - "time": "2024-01-04T17:06:16+00:00" + "time": "2024-04-03T18:51:33+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.30", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { @@ -6959,7 +6943,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -6967,7 +6951,7 @@ "type": "github" } ], - "time": "2023-12-22T06:47:57+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7212,16 +7196,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.15", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -7295,7 +7279,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -7311,7 +7295,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:55:19+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "sanmai/later", @@ -7379,16 +7363,16 @@ }, { "name": "sanmai/pipeline", - "version": "v6.9", + "version": "v6.10", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea" + "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/c48f45c22c3ce4140d071f7658fb151df1cc08ea", - "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/cbd2ea30ba8bef596b8dad1adb9c92fb2987e430", + "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430", "shasum": "" }, "require": { @@ -7432,7 +7416,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.9" + "source": "https://github.com/sanmai/pipeline/tree/v6.10" }, "funding": [ { @@ -7440,20 +7424,20 @@ "type": "github" } ], - "time": "2023-10-08T11:56:54+00:00" + "time": "2024-03-16T01:33:30+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -7488,7 +7472,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -7496,7 +7480,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -7805,16 +7789,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -7870,7 +7854,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -7878,20 +7862,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -7934,7 +7918,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -7942,7 +7926,7 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", @@ -8240,16 +8224,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -8261,7 +8245,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -8282,8 +8266,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -8291,7 +8274,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -8404,16 +8387,16 @@ }, { "name": "seld/jsonlint", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "76d449a358ece77d6f1d6331c68453e657172202" + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202", - "reference": "76d449a358ece77d6f1d6331c68453e657172202", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", "shasum": "" }, "require": { @@ -8452,7 +8435,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" }, "funding": [ { @@ -8464,20 +8447,20 @@ "type": "tidelift" } ], - "time": "2023-12-18T13:03:25+00:00" + "time": "2024-02-07T12:57:50+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.0", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -8487,11 +8470,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -8544,20 +8527,20 @@ "type": "open_collective" } ], - "time": "2023-12-08T12:32:31+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.21", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + "reference": "1303bb73d6c3882f07c618129295503085dfddb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/1303bb73d6c3882f07c618129295503085dfddb9", + "reference": "1303bb73d6c3882f07c618129295503085dfddb9", "shasum": "" }, "require": { @@ -8597,7 +8580,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.39" }, "funding": [ { @@ -8613,20 +8596,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.21", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" + "reference": "fb97497490bcec8a3c32c809cacfdd4c15dc8390" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", - "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb97497490bcec8a3c32c809cacfdd4c15dc8390", + "reference": "fb97497490bcec8a3c32c809cacfdd4c15dc8390", "shasum": "" }, "require": { @@ -8659,7 +8642,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.21" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.39" }, "funding": [ { @@ -8675,7 +8658,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/var-dumper", @@ -8907,16 +8890,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -8945,7 +8928,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -8953,7 +8936,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vimeo/psalm", diff --git a/docs/CHANGELOG_2.0.md b/docs/CHANGELOG_2.0.md index 141cef5ed..bdc8c644a 100644 --- a/docs/CHANGELOG_2.0.md +++ b/docs/CHANGELOG_2.0.md @@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.13 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.13) (2024-05-04) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.12...2.0.13) + +### Added + +- GitHub Actions pipeline (backport from v2.1) + support of PHP 8.2 and 8.3. + +### Fixed + +- Security issue with remember me key in auth. See: https://chmod744.super.site/redacted-vulnerability. + + ## [2.0.12 (Rick Sanchez)](https://github.com/php-censor/php-censor/tree/2.0.12) (2024-01-11) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.0.11...2.0.12) diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php index 5df34b1b0..29035b76e 100644 --- a/src/Controller/SessionController.php +++ b/src/Controller/SessionController.php @@ -150,7 +150,7 @@ public function login() $response = new RedirectResponse($this->getLoginRedirect()); if ($rememberMe) { - $rememberKey = md5(random_bytes(64)); + $rememberKey = \md5(\random_bytes(64)); $user->setRememberKey($rememberKey); $this->userStore->save($user); From 414af19e43e475d3ce2d27de38f91f09fe571ac0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 4 May 2024 18:08:41 +0700 Subject: [PATCH 198/212] Fixed versions in README.md. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c74a4c9de..c7d193700 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.12` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.4` | `release-2.1` | Current stable version | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.13` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.5` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From b43cb01eabe1d0245c09863320cfbab652d4283b Mon Sep 17 00:00:00 2001 From: "Yugeon A. Gruzdev" Date: Mon, 24 Feb 2025 14:34:43 +0300 Subject: [PATCH 199/212] Support for notifications in telegram group topics --- src/Plugin/TelegramNotify.php | 23 +++++++++++++++ tests/src/Plugin/TelegramNotifyTest.php | 39 +++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 tests/src/Plugin/TelegramNotifyTest.php diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index e149bf1ee..89b7c43c7 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -90,6 +90,12 @@ public function execute() 'text' => $message, 'parse_mode' => 'Markdown', ]; + + $messageThreadId = $this->getMessageThreadIdFromGroupId($chatId); + if ($messageThreadId !== null) { + $params['message_thread_id'] = $messageThreadId; + } + $client->post(('https://api.telegram.org' . $url), [ 'headers' => [ 'Content-Type' => 'application/json', @@ -103,6 +109,11 @@ public function execute() 'text' => $this->buildMsg, 'parse_mode' => 'Markdown', ]; + + if ($messageThreadId !== null) { + $params['message_thread_id'] = $messageThreadId; + } + $client->post(('https://api.telegram.org' . $url), [ 'headers' => [ 'Content-Type' => 'application/json', @@ -142,4 +153,16 @@ private function buildMessage() return $this->builder->interpolate(\str_replace(['%ICON_BUILD%'], [$buildIcon], $this->message)); } + + /** + * Split chat group id to chat id and message thread id + * + * @param string|int $chatId + * @return string|null + */ + protected function getMessageThreadIdFromGroupId($chatId) + { + $parts = explode('/', $chatId); + return (count($parts) > 1 && $parts[1] !== '') ? $parts[1] : null; + } } diff --git a/tests/src/Plugin/TelegramNotifyTest.php b/tests/src/Plugin/TelegramNotifyTest.php new file mode 100644 index 000000000..eff4797f0 --- /dev/null +++ b/tests/src/Plugin/TelegramNotifyTest.php @@ -0,0 +1,39 @@ +getMethod('getMessageThreadIdFromGroupId'); + $method->setAccessible(true); + $instance = $reflection->newInstanceWithoutConstructor(); + + $result = $method->invoke($instance, $chatId); + self::assertSame($expectedThreadId, $result); + } + + public function chatIdProvider(): array + { + return [ + 'without message thread id' => ['-12345', null], + 'with message thread id' => ['12345/67890', '67890'], + 'empty thread id' => ['12345/', null], + 'not group chat' => ['12345', null], + 'empty input' => ['', null], + 'only slash' => ['/', null], + 'double slash' => ['//', null], + 'group id digits only' => [12345, null], + ]; + } +} From c460a105b06ebe85656d89ee5247bd5c03fd8350 Mon Sep 17 00:00:00 2001 From: "Yugeon A. Gruzdev" Date: Mon, 24 Feb 2025 14:44:32 +0300 Subject: [PATCH 200/212] doc update --- docs/en/plugins/telegram_notify.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/plugins/telegram_notify.md b/docs/en/plugins/telegram_notify.md index 105ec4718..a89327734 100644 --- a/docs/en/plugins/telegram_notify.md +++ b/docs/en/plugins/telegram_notify.md @@ -24,6 +24,7 @@ complete: recipients: - "" - "-" + - "-/" - "@" send_log: true ``` From cae8a68ccb254cdc4d0c71f181f6e1b48430b266 Mon Sep 17 00:00:00 2001 From: "Yugeon A. Gruzdev" Date: Mon, 24 Feb 2025 19:28:36 +0300 Subject: [PATCH 201/212] Splitting the incoming chatId into chat and topic ids --- src/Plugin/TelegramNotify.php | 26 ++++++++++++++----------- tests/src/Plugin/TelegramNotifyTest.php | 23 ++++++++++++---------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index 89b7c43c7..cf4318cf8 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -85,15 +85,17 @@ public function execute() $url = '/bot' . $this->authToken . '/sendMessage'; foreach ($this->recipients as $chatId) { + $chatId = $this->builder->interpolate($chatId, true); + [$chatId, $topicId] = $this->splitChatIdAndTopicId($chatId); + $params = [ - 'chat_id' => $this->builder->interpolate($chatId, true), + 'chat_id' => $chatId, 'text' => $message, 'parse_mode' => 'Markdown', ]; - $messageThreadId = $this->getMessageThreadIdFromGroupId($chatId); - if ($messageThreadId !== null) { - $params['message_thread_id'] = $messageThreadId; + if ($topicId !== null) { + $params['message_thread_id'] = $topicId; } $client->post(('https://api.telegram.org' . $url), [ @@ -110,8 +112,8 @@ public function execute() 'parse_mode' => 'Markdown', ]; - if ($messageThreadId !== null) { - $params['message_thread_id'] = $messageThreadId; + if ($topicId !== null) { + $params['message_thread_id'] = $topicId; } $client->post(('https://api.telegram.org' . $url), [ @@ -155,14 +157,16 @@ private function buildMessage() } /** - * Split chat group id to chat id and message thread id + * Split chat group id to chat id and topic id * * @param string|int $chatId - * @return string|null + * @return array{string, string|null} */ - protected function getMessageThreadIdFromGroupId($chatId) + protected function splitChatIdAndTopicId($chatId) { - $parts = explode('/', $chatId); - return (count($parts) > 1 && $parts[1] !== '') ? $parts[1] : null; + $parts = \explode('/', \trim((string) $chatId) . '/'); + $topicId = $parts[1] !== '' ? $parts[1] : null; + + return [$parts[0], $topicId]; } } diff --git a/tests/src/Plugin/TelegramNotifyTest.php b/tests/src/Plugin/TelegramNotifyTest.php index eff4797f0..80e66063c 100644 --- a/tests/src/Plugin/TelegramNotifyTest.php +++ b/tests/src/Plugin/TelegramNotifyTest.php @@ -12,10 +12,10 @@ class TelegramNotifyTest extends TestCase /** * @dataProvider chatIdProvider */ - public function testGetMessageThreadIdFromGroupId($chatId, $expectedThreadId): void + public function testSplitChatIdAndTopicId($chatId, $expectedThreadId): void { $reflection = new \ReflectionClass(TelegramNotify::class); - $method = $reflection->getMethod('getMessageThreadIdFromGroupId'); + $method = $reflection->getMethod('splitChatIdAndTopicId'); $method->setAccessible(true); $instance = $reflection->newInstanceWithoutConstructor(); @@ -26,14 +26,17 @@ public function testGetMessageThreadIdFromGroupId($chatId, $expectedThreadId): v public function chatIdProvider(): array { return [ - 'without message thread id' => ['-12345', null], - 'with message thread id' => ['12345/67890', '67890'], - 'empty thread id' => ['12345/', null], - 'not group chat' => ['12345', null], - 'empty input' => ['', null], - 'only slash' => ['/', null], - 'double slash' => ['//', null], - 'group id digits only' => [12345, null], + 'without message thread id' => ['-12345', ['-12345', null]], + 'with message thread id' => ['12345/67890', ['12345', '67890']], + 'empty thread id' => ['12345/', ['12345', null]], + 'not group chat' => ['12345', ['12345', null]], + 'empty input' => ['', ['', null]], + 'only slash' => ['/', ['', null]], + 'double slash' => ['//', ['', null]], + 'group id digits only' => [12345, ['12345', null]], + 'group id digits only (negative)' => [-12345, ['-12345', null]], + 'zero topic id' => ['-12345/0', ['-12345', '0']], + 'spaces' => [' -12345/0 ', ['-12345', '0']], ]; } } From 4c399541d8a97cf40c7601e61dc540270977e480 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 1 Mar 2025 13:34:47 +0700 Subject: [PATCH 202/212] Updated dependencies. --- composer.lock | 1217 ++++++++++++++++++++++++------------------------- 1 file changed, 593 insertions(+), 624 deletions(-) diff --git a/composer.lock b/composer.lock index 17177fcb1..51e39b92f 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.5.2", + "version": "4.5.9", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -68,7 +68,7 @@ }, { "name": "cakephp/database", - "version": "4.5.2", + "version": "4.5.9", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", @@ -124,16 +124,16 @@ }, { "name": "cakephp/datasource", - "version": "4.5.2", + "version": "4.5.9", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec" + "reference": "073bb5f3b082b87c20309c1b25b1ac2a238d97b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/5d11a35ffc09dee744faaab7f758aeb42c17cfec", - "reference": "5d11a35ffc09dee744faaab7f758aeb42c17cfec", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/073bb5f3b082b87c20309c1b25b1ac2a238d97b3", + "reference": "073bb5f3b082b87c20309c1b25b1ac2a238d97b3", "shasum": "" }, "require": { @@ -178,20 +178,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/datasource" }, - "time": "2023-11-05T07:32:10+00:00" + "time": "2024-11-19T19:41:00+00:00" }, { "name": "cakephp/utility", - "version": "4.5.2", + "version": "4.5.9", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", - "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def" + "reference": "708929115e5b400e1b5b76d8120ca2e51e2de199" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/9fb72974e91e81f1545a15a6d45f50c82cd77def", - "reference": "9fb72974e91e81f1545a15a6d45f50c82cd77def", + "url": "https://api.github.com/repos/cakephp/utility/zipball/708929115e5b400e1b5b76d8120ca2e51e2de199", + "reference": "708929115e5b400e1b5b76d8120ca2e51e2de199", "shasum": "" }, "require": { @@ -237,33 +237,31 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/utility" }, - "time": "2023-04-11T21:22:06+00:00" + "time": "2024-06-23T00:11:14+00:00" }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "1.4.10 || 2.0.3", + "phpstan/phpstan-phpunit": "^1.0 || ^2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -271,7 +269,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -282,22 +280,22 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.4" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-12-07T21:18:45+00:00" }, { "name": "doctrine/lexer", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", "shasum": "" }, "require": { @@ -305,11 +303,11 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", + "doctrine/coding-standard": "^9 || ^12", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" + "vimeo/psalm": "^4.11 || ^5.21" }, "type": "library", "autoload": { @@ -346,7 +344,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" + "source": "https://github.com/doctrine/lexer/tree/2.1.1" }, "funding": [ { @@ -362,7 +360,7 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:49:07+00:00" + "time": "2024-02-05T11:35:39+00:00" }, { "name": "egulias/email-validator", @@ -834,16 +832,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.2", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + "reference": "5cf826f2991858b54d5c3809bee745560a1042a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7", + "reference": "5cf826f2991858b54d5c3809bee745560a1042a7", "shasum": "" }, "require": { @@ -864,8 +862,8 @@ "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^8.5.38 || ^9.6.19", "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", @@ -920,7 +918,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + "source": "https://github.com/Seldaek/monolog/tree/2.10.0" }, "funding": [ { @@ -932,20 +930,20 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:25:26+00:00" + "time": "2024-11-12T12:43:37+00:00" }, { "name": "pda/pheanstalk", - "version": "v4.0.4", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/pheanstalk/pheanstalk.git", - "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4" + "reference": "1459f2f62dddfe28902e0584708417dddd79bd70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/1a43eb97a53144a2e692bce2ea2be721cc9913a4", - "reference": "1a43eb97a53144a2e692bce2ea2be721cc9913a4", + "url": "https://api.github.com/repos/pheanstalk/pheanstalk/zipball/1459f2f62dddfe28902e0584708417dddd79bd70", + "reference": "1459f2f62dddfe28902e0584708417dddd79bd70", "shasum": "" }, "require": { @@ -985,9 +983,9 @@ ], "support": { "issues": "https://github.com/pheanstalk/pheanstalk/issues", - "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.4" + "source": "https://github.com/pheanstalk/pheanstalk/tree/v4.0.5" }, - "time": "2021-11-19T15:00:20+00:00" + "time": "2024-01-11T15:06:06+00:00" }, { "name": "php-censor/common", @@ -1609,16 +1607,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -1663,7 +1661,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -1671,20 +1669,20 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sensiolabs/ansi-to-html", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/sensiolabs/ansi-to-html.git", - "reference": "94a3145aae4733ff933c8910263ef56d1ae317a9" + "reference": "7a6c16623c02bdbcbe907ab2abcf465ebb31db72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/94a3145aae4733ff933c8910263ef56d1ae317a9", - "reference": "94a3145aae4733ff933c8910263ef56d1ae317a9", + "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/7a6c16623c02bdbcbe907ab2abcf465ebb31db72", + "reference": "7a6c16623c02bdbcbe907ab2abcf465ebb31db72", "shasum": "" }, "require": { @@ -1700,11 +1698,6 @@ "twig/twig": "Provides nice templating features" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, "autoload": { "psr-4": { "SensioLabs\\AnsiConverter\\": "SensioLabs/AnsiConverter" @@ -1723,9 +1716,9 @@ "description": "A library to convert a text with ANSI codes to HTML", "support": { "issues": "https://github.com/sensiolabs/ansi-to-html/issues", - "source": "https://github.com/sensiolabs/ansi-to-html/tree/v1.2.1" + "source": "https://github.com/sensiolabs/ansi-to-html/tree/v1.3.0" }, - "time": "2020-10-06T05:48:55+00:00" + "time": "2024-11-25T09:31:54+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -1805,16 +1798,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.4.31", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe" + "reference": "03cce39764429e07fbab9b989a1182a24578341d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ed1f634a36606f2065eec221b3975e05016cbbe", - "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/03cce39764429e07fbab9b989a1182a24578341d", + "reference": "03cce39764429e07fbab9b989a1182a24578341d", "shasum": "" }, "require": { @@ -1857,7 +1850,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.4.31" + "source": "https://github.com/symfony/browser-kit/tree/v5.4.45" }, "funding": [ { @@ -1873,20 +1866,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T07:58:33+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/cache", - "version": "v5.4.32", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40" + "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40", - "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40", + "url": "https://api.github.com/repos/symfony/cache/zipball/0fe08ee32cec2748fbfea10c52d3ee02049e0f6b", + "reference": "0fe08ee32cec2748fbfea10c52d3ee02049e0f6b", "shasum": "" }, "require": { @@ -1915,7 +1908,7 @@ "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", "doctrine/dbal": "^2.13.1|^3|^4", - "predis/predis": "^1.1", + "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", @@ -1954,7 +1947,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.32" + "source": "https://github.com/symfony/cache/tree/v5.4.46" }, "funding": [ { @@ -1970,20 +1963,20 @@ "type": "tidelift" } ], - "time": "2023-11-24T13:04:07+00:00" + "time": "2024-11-04T11:43:55+00:00" }, { "name": "symfony/cache-contracts", - "version": "v2.5.2", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc" + "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", - "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/517c3a3619dadfa6952c4651767fcadffb4df65e", + "reference": "517c3a3619dadfa6952c4651767fcadffb4df65e", "shasum": "" }, "require": { @@ -1995,12 +1988,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -2033,7 +2026,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.4" }, "funding": [ { @@ -2049,20 +2042,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/config", - "version": "v5.4.31", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9" + "reference": "977c88a02d7d3f16904a81907531b19666a08e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", - "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", + "url": "https://api.github.com/repos/symfony/config/zipball/977c88a02d7d3f16904a81907531b19666a08e78", + "reference": "977c88a02d7d3f16904a81907531b19666a08e78", "shasum": "" }, "require": { @@ -2112,7 +2105,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.31" + "source": "https://github.com/symfony/config/tree/v5.4.46" }, "funding": [ { @@ -2128,20 +2121,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:22:43+00:00" + "time": "2024-10-30T07:58:02+00:00" }, { "name": "symfony/console", - "version": "v5.4.32", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", - "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", "shasum": "" }, "require": { @@ -2211,7 +2204,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.32" + "source": "https://github.com/symfony/console/tree/v5.4.47" }, "funding": [ { @@ -2227,20 +2220,20 @@ "type": "tidelift" } ], - "time": "2023-11-18T18:23:04+00:00" + "time": "2024-11-06T11:30:55+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.26", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" + "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", - "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4f7f3c35fba88146b56d0025d20ace3f3901f097", + "reference": "4f7f3c35fba88146b56d0025d20ace3f3901f097", "shasum": "" }, "require": { @@ -2277,7 +2270,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.26" + "source": "https://github.com/symfony/css-selector/tree/v5.4.45" }, "funding": [ { @@ -2293,20 +2286,20 @@ "type": "tidelift" } ], - "time": "2023-07-07T06:10:25+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.33", + "version": "v5.4.48", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79" + "reference": "e5ca16dee39ef7d63e552ff0bf0a2526a1142c92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14969a558cd6382b2a12b14b20ef9a851a02da79", - "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e5ca16dee39ef7d63e552ff0bf0a2526a1142c92", + "reference": "e5ca16dee39ef7d63e552ff0bf0a2526a1142c92", "shasum": "" }, "require": { @@ -2366,7 +2359,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.33" + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.48" }, "funding": [ { @@ -2382,20 +2375,20 @@ "type": "tidelift" } ], - "time": "2023-11-30T08:15:37+00:00" + "time": "2024-11-20T10:51:57+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918", + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918", "shasum": "" }, "require": { @@ -2403,12 +2396,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -2433,7 +2426,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4" }, "funding": [ { @@ -2449,20 +2442,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.4.32", + "version": "v5.4.48", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201" + "reference": "b57df76f4757a9a8dfbb57ba48d7780cc20776c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201", - "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b57df76f4757a9a8dfbb57ba48d7780cc20776c6", + "reference": "b57df76f4757a9a8dfbb57ba48d7780cc20776c6", "shasum": "" }, "require": { @@ -2508,7 +2501,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.48" }, "funding": [ { @@ -2524,20 +2517,20 @@ "type": "tidelift" } ], - "time": "2023-11-17T20:43:48+00:00" + "time": "2024-11-13T14:36:38+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.26", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", - "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9", + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9", "shasum": "" }, "require": { @@ -2593,7 +2586,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45" }, "funding": [ { @@ -2609,20 +2602,20 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:34:20+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f", + "reference": "e0fe3d79b516eb75126ac6fa4cbf19b79b08c99f", "shasum": "" }, "require": { @@ -2634,12 +2627,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -2672,7 +2665,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.4" }, "funding": [ { @@ -2688,20 +2681,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.25", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c8294ed37d4a055b77057827c67f9558c95c54", + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54", "shasum": "" }, "require": { @@ -2710,6 +2703,9 @@ "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, + "require-dev": { + "symfony/process": "^5.4|^6.4" + }, "type": "library", "autoload": { "psr-4": { @@ -2736,7 +2732,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + "source": "https://github.com/symfony/filesystem/tree/v5.4.45" }, "funding": [ { @@ -2752,20 +2748,20 @@ "type": "tidelift" } ], - "time": "2023-05-31T13:04:02+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/finder", - "version": "v5.4.27", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" + "reference": "63741784cd7b9967975eec610b256eed3ede022b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", - "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b", + "reference": "63741784cd7b9967975eec610b256eed3ede022b", "shasum": "" }, "require": { @@ -2799,7 +2795,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.27" + "source": "https://github.com/symfony/finder/tree/v5.4.45" }, "funding": [ { @@ -2815,20 +2811,20 @@ "type": "tidelift" } ], - "time": "2023-07-31T08:02:31+00:00" + "time": "2024-09-28T13:32:08+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.32", + "version": "v5.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2" + "reference": "3f38b8af283b830e1363acd79e5bc3412d055341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cbcd80a4c36f59772d62860fdb0cb6a38da63fd2", - "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3f38b8af283b830e1363acd79e5bc3412d055341", + "reference": "3f38b8af283b830e1363acd79e5bc3412d055341", "shasum": "" }, "require": { @@ -2838,7 +2834,7 @@ "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "predis/predis": "~1.0", + "predis/predis": "^1.0|^2.0", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", @@ -2875,7 +2871,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.32" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.48" }, "funding": [ { @@ -2891,20 +2887,20 @@ "type": "tidelift" } ], - "time": "2023-11-20T15:40:25+00:00" + "time": "2024-11-13T18:58:02+00:00" }, { "name": "symfony/mailer", - "version": "v5.4.31", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "5ca8a7628a5ee69767047dd0f4cf4c9521c999b8" + "reference": "f732e1fafdf0f4a2d865e91f1018aaca174aeed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/5ca8a7628a5ee69767047dd0f4cf4c9521c999b8", - "reference": "5ca8a7628a5ee69767047dd0f4cf4c9521c999b8", + "url": "https://api.github.com/repos/symfony/mailer/zipball/f732e1fafdf0f4a2d865e91f1018aaca174aeed9", + "reference": "f732e1fafdf0f4a2d865e91f1018aaca174aeed9", "shasum": "" }, "require": { @@ -2951,7 +2947,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v5.4.31" + "source": "https://github.com/symfony/mailer/tree/v5.4.45" }, "funding": [ { @@ -2967,20 +2963,20 @@ "type": "tidelift" } ], - "time": "2023-11-03T16:16:43+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/mime", - "version": "v5.4.26", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", - "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "url": "https://api.github.com/repos/symfony/mime/zipball/8c1b9b3e5b52981551fc6044539af1d974e39064", + "reference": "8c1b9b3e5b52981551fc6044539af1d974e39064", "shasum": "" }, "require": { @@ -2995,15 +2991,16 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" + "symfony/serializer": "<5.4.35|>=6,<6.3.12|>=6.4,<6.4.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/process": "^5.4|^6.4", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" + "symfony/serializer": "^5.4.35|~6.3.12|^6.4.3" }, "type": "library", "autoload": { @@ -3035,7 +3032,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.26" + "source": "https://github.com/symfony/mime/tree/v5.4.45" }, "funding": [ { @@ -3051,24 +3048,24 @@ "type": "tidelift" } ], - "time": "2023-07-27T06:29:31+00:00" + "time": "2024-10-23T20:18:32+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -3078,12 +3075,9 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3117,7 +3111,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -3133,24 +3127,24 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956", + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-iconv": "*" @@ -3160,12 +3154,9 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3200,7 +3191,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0" }, "funding": [ { @@ -3216,36 +3207,33 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3281,7 +3269,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -3297,38 +3285,34 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3368,7 +3352,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -3384,36 +3368,33 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:30:37+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3452,7 +3433,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -3468,24 +3449,24 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -3495,12 +3476,9 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3535,7 +3513,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -3551,41 +3529,30 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "type": "library", + "type": "metapackage", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -3611,7 +3578,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" }, "funding": [ { @@ -3627,33 +3594,30 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3690,7 +3654,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -3706,33 +3670,30 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3773,7 +3734,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -3789,33 +3750,30 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.28.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3852,7 +3810,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -3868,20 +3826,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v5.4.28", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d", + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d", "shasum": "" }, "require": { @@ -3914,7 +3872,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.28" + "source": "https://github.com/symfony/process/tree/v5.4.47" }, "funding": [ { @@ -3930,20 +3888,20 @@ "type": "tidelift" } ], - "time": "2023-08-07T10:36:04+00:00" + "time": "2024-11-06T11:36:42+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "f37b419f7aea2e9abf10abd261832cace12e3300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f37b419f7aea2e9abf10abd261832cace12e3300", + "reference": "f37b419f7aea2e9abf10abd261832cace12e3300", "shasum": "" }, "require": { @@ -3959,12 +3917,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -3997,7 +3955,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.4" }, "funding": [ { @@ -4013,20 +3971,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/string", - "version": "v5.4.32", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "91bf4453d65d8231688a04376c3a40efe0770f04" + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04", - "reference": "91bf4453d65d8231688a04376c3a40efe0770f04", + "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799", + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799", "shasum": "" }, "require": { @@ -4083,7 +4041,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.32" + "source": "https://github.com/symfony/string/tree/v5.4.47" }, "funding": [ { @@ -4099,20 +4057,20 @@ "type": "tidelift" } ], - "time": "2023-11-26T13:43:46+00:00" + "time": "2024-11-10T20:33:58+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.32", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add" + "reference": "862700068db0ddfd8c5b850671e029a90246ec75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add", - "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/862700068db0ddfd8c5b850671e029a90246ec75", + "reference": "862700068db0ddfd8c5b850671e029a90246ec75", "shasum": "" }, "require": { @@ -4156,7 +4114,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.32" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.45" }, "funding": [ { @@ -4172,20 +4130,20 @@ "type": "tidelift" } ], - "time": "2023-11-16T19:33:05+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.31", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f387675d7f5fc4231f7554baa70681f222f73563" + "reference": "a454d47278cc16a5db371fe73ae66a78a633371e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563", - "reference": "f387675d7f5fc4231f7554baa70681f222f73563", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a454d47278cc16a5db371fe73ae66a78a633371e", + "reference": "a454d47278cc16a5db371fe73ae66a78a633371e", "shasum": "" }, "require": { @@ -4231,7 +4189,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.31" + "source": "https://github.com/symfony/yaml/tree/v5.4.45" }, "funding": [ { @@ -4247,7 +4205,7 @@ "type": "tidelift" } ], - "time": "2023-11-03T14:41:28+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "voku/anti-xss", @@ -4334,16 +4292,16 @@ }, { "name": "voku/portable-ascii", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "b56450eed252f6801410d810c8e1727224ae0743" + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", - "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", "shasum": "" }, "require": { @@ -4368,7 +4326,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", @@ -4380,7 +4338,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" }, "funding": [ { @@ -4404,7 +4362,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:00+00:00" + "time": "2024-11-21T01:49:47+00:00" }, { "name": "voku/portable-utf8", @@ -4513,16 +4471,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -4534,8 +4492,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -4590,7 +4548,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -4598,20 +4556,20 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -4627,11 +4585,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -4655,7 +4608,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -4665,9 +4618,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -4675,7 +4627,7 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "composer/package-versions-deprecated", @@ -4823,24 +4775,24 @@ }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -4884,7 +4836,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -4900,7 +4852,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/xdebug-handler", @@ -5007,16 +4959,16 @@ }, { "name": "doctrine/annotations", - "version": "1.14.3", + "version": "1.14.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" + "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/253dca476f70808a5aeed3a47cc2cc88c5cab915", + "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915", "shasum": "" }, "require": { @@ -5027,11 +4979,11 @@ }, "require-dev": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "~1.4.10 || ^1.10.28", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "vimeo/psalm": "^4.10" + "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7", + "vimeo/psalm": "^4.30 || ^5.14" }, "suggest": { "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" @@ -5077,9 +5029,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" + "source": "https://github.com/doctrine/annotations/tree/1.14.4" }, - "time": "2023-02-01T09:20:38+00:00" + "time": "2024-09-05T10:15:52+00:00" }, { "name": "doctrine/instantiator", @@ -5198,16 +5150,16 @@ }, { "name": "felixfbecker/language-server-protocol", - "version": "v1.5.2", + "version": "v1.5.3", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" + "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9", + "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9", "shasum": "" }, "require": { @@ -5248,9 +5200,9 @@ ], "support": { "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", - "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2" + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3" }, - "time": "2022-03-02T22:36:06+00:00" + "time": "2024-04-30T00:40:11+00:00" }, { "name": "friendsofphp/php-cs-fixer", @@ -5646,20 +5598,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "url": "https://github.com/jsonrainbow/json-schema.git", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -5670,11 +5622,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -5709,23 +5656,23 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "024473a478be9df5fdaca2c793f2232fe788e414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", + "reference": "024473a478be9df5fdaca2c793f2232fe788e414", "shasum": "" }, "require": { @@ -5733,11 +5680,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -5763,7 +5711,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" }, "funding": [ { @@ -5771,20 +5719,20 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2025-02-12T12:17:51+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.5.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8e76efb98ee8b6afc54687045e1b8dba55ac76e5", + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5", "shasum": "" }, "require": { @@ -5795,7 +5743,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -5820,31 +5768,31 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.5.0" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-09-08T10:13:13+00:00" }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2", + "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -5876,9 +5824,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-09-29T15:01:53+00:00" }, { "name": "ondram/ci-detector", @@ -6070,20 +6018,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -6124,9 +6073,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -6310,16 +6265,16 @@ }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + "reference": "6db563514f27e19595a19f45a4bf757b6401194e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", + "reference": "6db563514f27e19595a19f45a4bf757b6401194e", "shasum": "" }, "require": { @@ -6357,13 +6312,17 @@ "email": "ahoj@jakubonderka.cz" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "keywords": [ + "lint", + "static analysis" + ], "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" }, - "time": "2022-02-21T12:50:22+00:00" + "time": "2024-03-27T12:14:49+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -6420,28 +6379,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5 || ~1.6.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -6465,35 +6431,35 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-12-07T09:39:29+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -6529,9 +6495,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phploc/phploc", @@ -6679,26 +6645,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.18.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -6742,33 +6709,36 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" }, - "time": "2023-12-07T16:22:33+00:00" + "time": "2024-11-19T13:12:41+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.1.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "29f8114c2c319a4308e6b070902211e062efa392" + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", - "reference": "29f8114c2c319a4308e6b070902211e062efa392", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f", + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f", "shasum": "" }, "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit": "^9.1 || ^10.1" + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -6794,36 +6764,36 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0" }, - "time": "2023-12-08T12:48:02+00:00" + "time": "2024-11-19T13:24:17+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.5", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" + "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", - "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -6841,22 +6811,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" }, - "time": "2023-12-16T09:33:33+00:00" + "time": "2025-02-19T13:28:12+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.50", + "version": "1.12.19", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" + "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c42ba9bab7a940ed00092ecb1c77bad98896d789", + "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789", "shasum": "" }, "require": { @@ -6899,45 +6869,41 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2023-12-13T10:59:42+00:00" + "time": "2025-02-19T15:42:21+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -6946,7 +6912,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -6975,7 +6941,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -6983,7 +6949,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7228,45 +7194,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.15", + "version": "9.6.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.1", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -7311,7 +7277,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" }, "funding": [ { @@ -7327,7 +7293,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:55:19+00:00" + "time": "2024-12-05T13:48:26+00:00" }, { "name": "rector/rector", @@ -7452,16 +7418,16 @@ }, { "name": "sanmai/pipeline", - "version": "v6.9", + "version": "6.12", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea" + "reference": "ad7dbc3f773eeafb90d5459522fbd8f188532e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/c48f45c22c3ce4140d071f7658fb151df1cc08ea", - "reference": "c48f45c22c3ce4140d071f7658fb151df1cc08ea", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/ad7dbc3f773eeafb90d5459522fbd8f188532e25", + "reference": "ad7dbc3f773eeafb90d5459522fbd8f188532e25", "shasum": "" }, "require": { @@ -7505,7 +7471,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.9" + "source": "https://github.com/sanmai/pipeline/tree/6.12" }, "funding": [ { @@ -7513,20 +7479,20 @@ "type": "github" } ], - "time": "2023-10-08T11:56:54+00:00" + "time": "2024-10-17T02:22:57+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -7561,7 +7527,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -7569,7 +7535,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -7758,20 +7724,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -7803,7 +7769,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -7811,7 +7777,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/environment", @@ -7878,16 +7844,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -7943,7 +7909,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -7951,20 +7917,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -8007,7 +7973,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -8015,24 +7981,24 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -8064,7 +8030,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -8072,7 +8038,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -8313,16 +8279,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -8334,7 +8300,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -8355,8 +8321,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -8364,7 +8329,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -8477,23 +8442,23 @@ }, { "name": "seld/jsonlint", - "version": "1.10.1", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "76d449a358ece77d6f1d6331c68453e657172202" + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202", - "reference": "76d449a358ece77d6f1d6331c68453e657172202", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.5", + "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, "bin": [ @@ -8525,7 +8490,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1" + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" }, "funding": [ { @@ -8537,20 +8502,20 @@ "type": "tidelift" } ], - "time": "2023-12-18T13:03:25+00:00" + "time": "2024-07-11T14:55:45+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.0", + "version": "3.11.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" + "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", - "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", + "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", "shasum": "" }, "require": { @@ -8560,11 +8525,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -8615,22 +8580,26 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2023-12-08T12:32:31+00:00" + "time": "2025-01-23T17:04:15+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.21", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", "shasum": "" }, "require": { @@ -8670,7 +8639,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.45" }, "funding": [ { @@ -8686,20 +8655,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.21", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", - "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb2c199cf302eb207f8c23e7ee174c1c31a5c004", + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004", "shasum": "" }, "require": { @@ -8732,7 +8701,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.21" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.45" }, "funding": [ { @@ -8748,7 +8717,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/var-dumper", @@ -8980,16 +8949,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -9018,7 +8987,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -9026,7 +8995,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vimeo/psalm", @@ -9100,10 +9069,10 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev", - "dev-3.x": "3.x-dev", + "dev-1.x": "1.x-dev", "dev-2.x": "2.x-dev", - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev", + "dev-master": "4.x-dev" } }, "autoload": { @@ -9248,7 +9217,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -9262,6 +9231,6 @@ "ext-curl": "*", "ext-bcmath": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } From 92f2a32cdaf29f97e217e88689799f5376c534da Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 1 Mar 2025 13:36:27 +0700 Subject: [PATCH 203/212] Fixed code style for TelegramNotify. --- src/Plugin/TelegramNotify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/TelegramNotify.php b/src/Plugin/TelegramNotify.php index cf4318cf8..dbbb0bb58 100644 --- a/src/Plugin/TelegramNotify.php +++ b/src/Plugin/TelegramNotify.php @@ -159,7 +159,7 @@ private function buildMessage() /** * Split chat group id to chat id and topic id * - * @param string|int $chatId + * @param int|string $chatId * @return array{string, string|null} */ protected function splitChatIdAndTopicId($chatId) From 2946e9512bd237b88f496373df4344cd4e0591ec Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 1 Mar 2025 13:40:53 +0700 Subject: [PATCH 204/212] Fixed broken link to PHPCI. --- README.md | 2 +- docs/CHANGELOG_0.x.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c7d193700..2b15d20ed 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@

          **PHP Censor** is an open source, self-hosted, continuous integration server for PHP projects -([PHPCI](https://www.phptesting.org) fork). [Official twitter @php_censor](https://twitter.com/php_censor). +([PHPCI](https://github.com/dancryer/PHPCI) fork). [Official twitter @php_censor](https://twitter.com/php_censor). PHP Censor versions: diff --git a/docs/CHANGELOG_0.x.md b/docs/CHANGELOG_0.x.md index f9ce08ccd..5b57c35a8 100644 --- a/docs/CHANGELOG_0.x.md +++ b/docs/CHANGELOG_0.x.md @@ -941,7 +941,7 @@ requests as comments on Github (`php-censor.github.comments.commit` and `php-cen ## [0.1.0](https://github.com/php-censor/php-censor/tree/0.1.0) (2017-01-04) -Initial release. Changes from [PHPCI](https://www.phptesting.org/) v1.7.1: +Initial release. Changes from [PHPCI](https://github.com/dancryer/PHPCI) v1.7.1: ### Added From 1e88f8cdea7fe2c2443164a9a9bc259885b5736f Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 16 Mar 2025 00:27:49 +0700 Subject: [PATCH 205/212] Added changelog for version 2.1.6 and upgrade dependencies and VERSION.md for release 2.1.6. --- CHANGELOG.md | 10 ++++++++++ VERSION.md | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0722ed41e..0e9897fbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.1.6 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.6) (2025-03-15) + +[Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.5...2.1.6) + +### Fixed + +- Security issue with remember me key in auth. See: https://chmod744.super.site/redacted-vulnerability. +- Security issue CVE-2024-50345: CVE-2024-50345: Open redirect via browser-sanitized URLs. See: https://symfony.com/cve-2024-50345. + + ## [2.1.5 (Mr. Meeseeks)](https://github.com/php-censor/php-censor/tree/2.1.5) (2024-05-04) [Full Changelog](https://github.com/php-censor/php-censor/compare/2.1.4...2.1.5) diff --git a/VERSION.md b/VERSION.md index cd57a8b95..399088bf4 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.1.5 +2.1.6 From 7a4a6fde14b0e4296e194776f088a6f3d6f2834d Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 16 Mar 2025 00:38:58 +0700 Subject: [PATCH 206/212] Updated version. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b15d20ed..89079768f 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ PHP Censor versions: | `1.1` (Birdperson) | `1.1.6` | `release-1.1` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.2` (Summer Smith) | `1.2.4` | `release-1.2` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | | `1.3` (Jerry Smith) | `1.3.7` | `release-1.3` | Old version (**UNSUPPORTED**) | `>=5.6, <8.0` | -| `2.0` (Rick Sanchez) | `2.0.13` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | -| `2.1` (Mr. Meeseeks) | `2.1.5` | `release-2.1` | Current stable version | `>=7.4` | +| `2.0` (Rick Sanchez) | `2.0.14` | `release-2.0` | Last stable version ([Upgrade from v1 to v2](docs/UPGRADE_2.0.md)) | `>=7.4` | +| `2.1` (Mr. Meeseeks) | `2.1.6` | `release-2.1` | Current stable version | `>=7.4` | | `2.2` | WIP | `master` | Feature minor version (WIP) | `>=7.4` | [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png) From f7dce7e1b44548b4dbeb46438998fca0cbacef99 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 2 Mar 2025 23:22:14 +0700 Subject: [PATCH 207/212] Improved installation error about domain URL. --- src/Command/InstallCommand.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index f688917f9..f6bc9b360 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -227,12 +227,12 @@ private function getConfigInformation(InputInterface $input, OutputInterface $ou /** @var $helper QuestionHelper */ $helper = $this->getHelperSet()->get('question'); - $urlValidator = function ($answer) { - if (!\filter_var($answer, FILTER_VALIDATE_URL)) { - throw new InvalidArgumentException('Must be a valid URL.'); + $urlValidator = function ($domain) { + if (!\filter_var($domain, FILTER_VALIDATE_URL)) { + throw new InvalidArgumentException("${domain} is not a valid URL!"); } - return \rtrim($answer, '/'); + return \rtrim($domain, '/'); }; if ($url = $input->getOption('url')) { From fd9ec6f377a5b4e4db0a99a2e7fd1e491ac4a06d Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 29 Mar 2025 22:38:09 +0700 Subject: [PATCH 208/212] Updated dependencies. --- composer.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index 51e39b92f..3cccdc794 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "cakephp/core", - "version": "4.5.9", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", @@ -68,7 +68,7 @@ }, { "name": "cakephp/database", - "version": "4.5.9", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", @@ -124,7 +124,7 @@ }, { "name": "cakephp/datasource", - "version": "4.5.9", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", @@ -182,7 +182,7 @@ }, { "name": "cakephp/utility", - "version": "4.5.9", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/cakephp/utility.git", @@ -6817,16 +6817,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.19", + "version": "1.12.23", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789" + "reference": "29201e7a743a6ab36f91394eab51889a82631428" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c42ba9bab7a940ed00092ecb1c77bad98896d789", - "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/29201e7a743a6ab36f91394eab51889a82631428", + "reference": "29201e7a743a6ab36f91394eab51889a82631428", "shasum": "" }, "require": { @@ -6871,7 +6871,7 @@ "type": "github" } ], - "time": "2025-02-19T15:42:21+00:00" + "time": "2025-03-23T14:57:32+00:00" }, { "name": "phpunit/php-code-coverage", @@ -8506,16 +8506,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.3", + "version": "3.12.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10" + "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", - "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/2d1b63db139c3c6ea0c927698e5160f8b3b8d630", + "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630", "shasum": "" }, "require": { @@ -8582,11 +8582,11 @@ "type": "open_collective" }, { - "url": "https://thanks.dev/phpcsstandards", + "url": "https://thanks.dev/u/gh/phpcsstandards", "type": "thanks_dev" } ], - "time": "2025-01-23T17:04:15+00:00" + "time": "2025-03-18T05:04:51+00:00" }, { "name": "symfony/options-resolver", From 6434ceba03efbbfcc21ec337af3a05a1a424c6dc Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 29 Mar 2025 22:45:11 +0700 Subject: [PATCH 209/212] Fix. --- src/Logging/BuildDBLogHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logging/BuildDBLogHandler.php b/src/Logging/BuildDBLogHandler.php index 4b33ab3c1..a0cfbd9a9 100644 --- a/src/Logging/BuildDBLogHandler.php +++ b/src/Logging/BuildDBLogHandler.php @@ -79,7 +79,7 @@ private function sanitize(string $message): string ROOT_DIR, ], [ '/', - '/', + '//', '/', '/', ], $message); From 4cb9149861d53f65ae35c25d7e43c5e2212c8825 Mon Sep 17 00:00:00 2001 From: jackieya Date: Mon, 11 May 2026 14:35:27 +0800 Subject: [PATCH 210/212] fix: prevent OS command injection via webhook branch parameter Apply escapeshellarg() to the branch parameter in GitBuild and HgBuild to prevent OS command injection (CWE-78) through the unauthenticated webhook endpoint. Also remove the double-quote wrapper around the branch format-string placeholder in GitBuild so that the single quotes produced by escapeshellarg() are effective at the shell level. --- src/Model/Build/GitBuild.php | 8 ++++---- src/Model/Build/HgBuild.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 77c388ab3..9a4f128d2 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -102,8 +102,8 @@ protected function cloneByHttp(Builder $builder, $cloneTo) $cmd .= ' --depth ' . \intval($buildSettings['clone_depth']) . ' '; } - $cmd .= ' -b "%s" "%s" "%s"'; - $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); + $cmd .= ' -b %s "%s" "%s"'; + $success = $builder->executeCommand($cmd, \escapeshellarg($this->getBranch()), $this->getCloneUrl(), $cloneTo); if ($success) { $success = $this->postCloneSetup($builder, $cloneTo); @@ -132,10 +132,10 @@ protected function cloneBySsh(Builder $builder, $cloneTo) $cmd .= ' --depth ' . \intval($buildSettings['clone_depth']) . ' '; } - $cmd .= ' -b "%s" "%s" "%s"'; + $cmd .= ' -b %s "%s" "%s"'; $cmd = 'export GIT_SSH="' . $gitSshWrapper . '" && ' . $cmd; - $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); + $success = $builder->executeCommand($cmd, \escapeshellarg($this->getBranch()), $this->getCloneUrl(), $cloneTo); if ($success) { $extra = [ diff --git a/src/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php index 6ac11e845..046dc8241 100644 --- a/src/Model/Build/HgBuild.php +++ b/src/Model/Build/HgBuild.php @@ -78,7 +78,7 @@ public function createWorkingCopy(Builder $builder, $buildPath) */ protected function cloneByHttp(Builder $builder, $cloneTo) { - return $builder->executeCommand('hg clone %s "%s" -r %s', $this->getCloneUrl(), $cloneTo, $this->getBranch()); + return $builder->executeCommand('hg clone %s "%s" -r %s', $this->getCloneUrl(), $cloneTo, \escapeshellarg($this->getBranch())); } /** @@ -94,7 +94,7 @@ protected function cloneBySsh(Builder $builder, $cloneTo) // Do the hg clone: $cmd = 'hg clone --ssh "ssh -i ' . $keyFile . '" %s "%s" -r %s'; - $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo, $this->getBranch()); + $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo, \escapeshellarg($this->getBranch())); if ($success) { $success = $this->postCloneSetup($builder, $cloneTo); @@ -121,7 +121,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul // Allow switching to a specific branch: if (!empty($commitId)) { $cmd = 'cd "%s" && hg checkout %s'; - $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch()); + $success = $builder->executeCommand($cmd, $cloneTo, \escapeshellarg($this->getBranch())); } return $success; From cd68d102601320bd319d590b75f7652e66f0685f Mon Sep 17 00:00:00 2001 From: jackieya Date: Mon, 11 May 2026 14:50:51 +0800 Subject: [PATCH 211/212] fix: also escape commitId parameter in git checkout and git log commands The commitId parameter also originates from the unauthenticated webhook request (the 'commit' query parameter) and is passed unsanitized into git checkout and git log shell commands in postCloneSetup(). Apply escapeshellarg() to all commitId usages to close this additional injection vector. --- src/Model/Build/GitBuild.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 9a4f128d2..65528935e 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -167,7 +167,7 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul if (empty($this->getEnvironmentId()) && !empty($commitId)) { $cmd = $chdir . ' && git checkout %s --quiet'; - $success = $builder->executeCommand($cmd, $cloneTo, $commitId); + $success = $builder->executeCommand($cmd, $cloneTo, \escapeshellarg($commitId)); } // Always update the commit hash with the actual HEAD hash @@ -176,11 +176,11 @@ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = nul $this->setCommitId($commitId); - if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%s %s', $cloneTo, $commitId)) { + if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%s %s', $cloneTo, \escapeshellarg($commitId))) { $this->setCommitMessage(\trim($builder->getLastOutput())); } - if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%ae %s', $cloneTo, $commitId)) { + if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%ae %s', $cloneTo, \escapeshellarg($commitId))) { $this->setCommitterEmail(\trim($builder->getLastOutput())); } } From 7b8e6404b7126caf972a2b993a635250b54dc0da Mon Sep 17 00:00:00 2001 From: YHalo <285117859@qq.com> Date: Sun, 31 May 2026 13:40:19 +0800 Subject: [PATCH 212/212] fix: escape svn webhook commit id in export command --- src/Model/Build/SvnBuild.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Build/SvnBuild.php b/src/Model/Build/SvnBuild.php index 97869dcbb..a1ab34981 100644 --- a/src/Model/Build/SvnBuild.php +++ b/src/Model/Build/SvnBuild.php @@ -111,7 +111,7 @@ protected function cloneByHttp(Builder $builder, $cloneTo) if (!empty($this->getCommitId())) { $cmd .= ' -r %s %s "%s"'; - $success = $builder->executeCommand($cmd, $this->getCommitId(), $this->getCloneUrl(), $cloneTo); + $success = $builder->executeCommand($cmd, \escapeshellarg($this->getCommitId()), $this->getCloneUrl(), $cloneTo); } else { $cmd .= ' %s "%s"'; $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo);