From 45e674a7335f61d83fe29b8283086a43f408bc76 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 21 Oct 2017 15:51:05 +0700 Subject: [PATCH 1/2] Fixed naming. --- src/PHPCensor/Application.php | 4 +--- src/PHPCensor/BuildFactory.php | 2 +- src/PHPCensor/Command/CreateAdminCommand.php | 2 +- src/PHPCensor/Command/InstallCommand.php | 4 ++-- src/PHPCensor/Command/WorkerCommand.php | 2 +- src/PHPCensor/Controller.php | 3 --- src/PHPCensor/Controller/BuildController.php | 4 +++- src/PHPCensor/Controller/HomeController.php | 4 ++-- src/PHPCensor/Helper/Email.php | 2 +- .../Migrations/20140513143726_initial_migration.php | 2 +- src/PHPCensor/Plugin.php | 2 -- src/PHPCensor/Plugin/CleanBuild.php | 2 +- src/PHPCensor/Plugin/Deployer.php | 2 +- src/PHPCensor/Plugin/Email.php | 2 +- src/PHPCensor/Plugin/FlowdockNotify.php | 4 +--- src/PHPCensor/Plugin/PhpUnit.php | 2 +- src/PHPCensor/Plugin/Util/Executor.php | 2 +- src/PHPCensor/Service/UserService.php | 2 +- src/PHPCensor/Store/ProjectStore.php | 2 +- src/PHPCensor/Worker/BuildWorker.php | 4 +--- src/PHPCensor/ZeroConfigPluginInterface.php | 2 -- tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php | 5 ++--- 22 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/PHPCensor/Application.php b/src/PHPCensor/Application.php index 9e7157f7..1e69eb56 100644 --- a/src/PHPCensor/Application.php +++ b/src/PHPCensor/Application.php @@ -9,8 +9,6 @@ use b8\Http\Response\RedirectResponse; use b8\View; /** - * PHPCI Front Controller - * * @author Dan Cryer */ class Application extends b8\Application @@ -21,7 +19,7 @@ class Application extends b8\Application protected $controller; /** - * Initialise PHPCI - Handles session verification, routing, etc. + * Initialise Application - Handles session verification, routing, etc. */ public function init() { diff --git a/src/PHPCensor/BuildFactory.php b/src/PHPCensor/BuildFactory.php index e1d46b3a..71393729 100644 --- a/src/PHPCensor/BuildFactory.php +++ b/src/PHPCensor/BuildFactory.php @@ -6,7 +6,7 @@ use b8\Store\Factory; use PHPCensor\Model\Build; /** - * PHPCI Build Factory - Takes in a generic "Build" and returns a type-specific build model. + * BuildFactory - Takes in a generic "Build" and returns a type-specific build model. * * @author Dan Cryer */ diff --git a/src/PHPCensor/Command/CreateAdminCommand.php b/src/PHPCensor/Command/CreateAdminCommand.php index a7f14929..c723459f 100644 --- a/src/PHPCensor/Command/CreateAdminCommand.php +++ b/src/PHPCensor/Command/CreateAdminCommand.php @@ -46,7 +46,7 @@ class CreateAdminCommand extends Command } /** - * Creates an admin user in the existing PHPCI database + * Creates an admin user in the existing database * * {@inheritDoc} */ diff --git a/src/PHPCensor/Command/InstallCommand.php b/src/PHPCensor/Command/InstallCommand.php index b7e631fa..f0e3b3f6 100644 --- a/src/PHPCensor/Command/InstallCommand.php +++ b/src/PHPCensor/Command/InstallCommand.php @@ -218,7 +218,7 @@ class InstallCommand extends Command } /** - * Load configuration for PHPCI form CLI options or ask info to user. + * Load configuration form CLI options or ask info to user. * * @param InputInterface $input * @param OutputInterface $output @@ -463,7 +463,7 @@ class InstallCommand extends Command } /** - * Write the PHPCI config.yml file. + * Write the config.yml file. * @param array $config */ protected function writeConfigFile(array $config) diff --git a/src/PHPCensor/Command/WorkerCommand.php b/src/PHPCensor/Command/WorkerCommand.php index 2946b542..3004c51b 100644 --- a/src/PHPCensor/Command/WorkerCommand.php +++ b/src/PHPCensor/Command/WorkerCommand.php @@ -57,7 +57,7 @@ class WorkerCommand extends Command ); } - // Allow PHPCI to run in "debug mode" + // Allow to run in "debug mode" if ($input->hasOption('debug') && $input->getOption('debug')) { $output->writeln('Debug mode enabled.'); define('DEBUG_MODE', true); diff --git a/src/PHPCensor/Controller.php b/src/PHPCensor/Controller.php index c0335893..a99ec1f6 100644 --- a/src/PHPCensor/Controller.php +++ b/src/PHPCensor/Controller.php @@ -8,9 +8,6 @@ use b8\Http\Request; use b8\Http\Response; use b8\View; -/** - * PHPCI Base Controller - */ class Controller extends \b8\Controller { /** diff --git a/src/PHPCensor/Controller/BuildController.php b/src/PHPCensor/Controller/BuildController.php index d8435d17..a00d4a93 100644 --- a/src/PHPCensor/Controller/BuildController.php +++ b/src/PHPCensor/Controller/BuildController.php @@ -202,8 +202,10 @@ class BuildController extends Controller } /** - * Formats a list of builds into rows suitable for the dropdowns in the PHPCI header bar. + * Formats a list of builds into rows suitable for the dropdowns in the header bar. + * * @param $builds + * * @return array */ protected function formatBuilds($builds) diff --git a/src/PHPCensor/Controller/HomeController.php b/src/PHPCensor/Controller/HomeController.php index 1187eb1b..04e1fa5b 100644 --- a/src/PHPCensor/Controller/HomeController.php +++ b/src/PHPCensor/Controller/HomeController.php @@ -9,7 +9,7 @@ use PHPCensor\Model\Build; use PHPCensor\Controller; /** - * Home Controller - Displays the PHPCI Dashboard. + * Home Controller - Displays the Dashboard. * * @author Dan Cryer */ @@ -41,7 +41,7 @@ class HomeController extends Controller } /** - * Display PHPCI dashboard: + * Display dashboard: */ public function index() { diff --git a/src/PHPCensor/Helper/Email.php b/src/PHPCensor/Helper/Email.php index 6f7ccc01..dd5eb78a 100644 --- a/src/PHPCensor/Helper/Email.php +++ b/src/PHPCensor/Helper/Email.php @@ -6,7 +6,7 @@ use b8\Config; use PHPCensor\Builder; /** - * Helper class for sending emails using PHPCI's email configuration. + * Helper class for sending emails using email configuration. */ class Email { diff --git a/src/PHPCensor/Migrations/20140513143726_initial_migration.php b/src/PHPCensor/Migrations/20140513143726_initial_migration.php index cab5b12a..9c329a68 100644 --- a/src/PHPCensor/Migrations/20140513143726_initial_migration.php +++ b/src/PHPCensor/Migrations/20140513143726_initial_migration.php @@ -3,7 +3,7 @@ use Phinx\Migration\AbstractMigration; /** - * Initial migration to create a PHPCI v1.2 database. + * Initial migration to create database. */ class InitialMigration extends AbstractMigration { diff --git a/src/PHPCensor/Plugin.php b/src/PHPCensor/Plugin.php index d0510baf..2ec77339 100644 --- a/src/PHPCensor/Plugin.php +++ b/src/PHPCensor/Plugin.php @@ -5,8 +5,6 @@ namespace PHPCensor; use PHPCensor\Model\Build; /** - * PHPCI Plugin class - Used by all build plugins. - * * @author Dan Cryer */ abstract class Plugin diff --git a/src/PHPCensor/Plugin/CleanBuild.php b/src/PHPCensor/Plugin/CleanBuild.php index 375b96dd..01f05e02 100644 --- a/src/PHPCensor/Plugin/CleanBuild.php +++ b/src/PHPCensor/Plugin/CleanBuild.php @@ -7,7 +7,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; /** - * Clean build removes Composer related files and allows PHPCI users to clean up their build directory. + * Clean build removes Composer related files and allows users to clean up their build directory. * Useful as a precursor to copy_build. * * @author Dan Cryer diff --git a/src/PHPCensor/Plugin/Deployer.php b/src/PHPCensor/Plugin/Deployer.php index c18fd735..c0e17ecc 100644 --- a/src/PHPCensor/Plugin/Deployer.php +++ b/src/PHPCensor/Plugin/Deployer.php @@ -8,7 +8,7 @@ use PHPCensor\Model\Build; use PHPCensor\Plugin; /** - * Integrates PHPCI with Deployer: https://github.com/rebelinblue/deployer + * Integration with Deployer: https://github.com/rebelinblue/deployer * * @author Dan Cryer */ diff --git a/src/PHPCensor/Plugin/Email.php b/src/PHPCensor/Plugin/Email.php index 0c0580dd..e64387b6 100644 --- a/src/PHPCensor/Plugin/Email.php +++ b/src/PHPCensor/Plugin/Email.php @@ -8,7 +8,7 @@ use Psr\Log\LogLevel; use PHPCensor\Plugin; /** - * Email Plugin - Provides simple email capability to PHPCI. + * Email Plugin - Provides simple email capability. * * @author Steve Brazier */ diff --git a/src/PHPCensor/Plugin/FlowdockNotify.php b/src/PHPCensor/Plugin/FlowdockNotify.php index a8d267e1..de57770d 100644 --- a/src/PHPCensor/Plugin/FlowdockNotify.php +++ b/src/PHPCensor/Plugin/FlowdockNotify.php @@ -11,9 +11,7 @@ use PHPCensor\Plugin; /** * Flowdock Plugin * - * @author Petr Cervenka - * @package PHPCI - * @subpackage Plugins + * @author Petr Cervenka */ class FlowdockNotify extends Plugin { diff --git a/src/PHPCensor/Plugin/PhpUnit.php b/src/PHPCensor/Plugin/PhpUnit.php index 941ab965..72e362b4 100644 --- a/src/PHPCensor/Plugin/PhpUnit.php +++ b/src/PHPCensor/Plugin/PhpUnit.php @@ -20,7 +20,7 @@ use PHPCensor\ZeroConfigPluginInterface; */ class PhpUnit extends Plugin implements ZeroConfigPluginInterface { - /** @var string[] Raw options from the PHPCI config file */ + /** @var string[] Raw options from the config file */ protected $options = []; /** diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php index 03f3ce76..a6f9c35c 100644 --- a/src/PHPCensor/Plugin/Util/Executor.php +++ b/src/PHPCensor/Plugin/Util/Executor.php @@ -44,7 +44,7 @@ class Executor /** * Execute a the appropriate set of plugins for a given build stage. * - * @param array $config PHPCI configuration + * @param array $config Configuration * @param string $stage * * @return bool diff --git a/src/PHPCensor/Service/UserService.php b/src/PHPCensor/Service/UserService.php index 7cb47852..a0990aee 100644 --- a/src/PHPCensor/Service/UserService.php +++ b/src/PHPCensor/Service/UserService.php @@ -24,7 +24,7 @@ class UserService } /** - * Create a new user within PHPCI. + * Create a new user. * * @param string $name * @param string $email diff --git a/src/PHPCensor/Store/ProjectStore.php b/src/PHPCensor/Store/ProjectStore.php index 70330f73..a77eef7a 100644 --- a/src/PHPCensor/Store/ProjectStore.php +++ b/src/PHPCensor/Store/ProjectStore.php @@ -98,7 +98,7 @@ class ProjectStore extends Store } /** - * Returns a list of all branch names PHPCI has run builds against. + * Returns a list of all branch names. * * @param $projectId * diff --git a/src/PHPCensor/Worker/BuildWorker.php b/src/PHPCensor/Worker/BuildWorker.php index afe23ca6..dcddb83a 100644 --- a/src/PHPCensor/Worker/BuildWorker.php +++ b/src/PHPCensor/Worker/BuildWorker.php @@ -146,7 +146,7 @@ class BuildWorker } /** - * Checks that the job received is actually from PHPCI, and has a valid type. + * Checks that the job received is actually, and has a valid type. * @param Job $job * @param $jobData * @return bool @@ -154,13 +154,11 @@ class BuildWorker protected function verifyJob(Job $job, $jobData) { if (empty($jobData) || !is_array($jobData)) { - // Probably not from PHPCI. $this->pheanstalk->delete($job); return false; } if (!array_key_exists('type', $jobData) || $jobData['type'] !== 'php-censor.build') { - // Probably not from PHPCI. $this->pheanstalk->delete($job); return false; } diff --git a/src/PHPCensor/ZeroConfigPluginInterface.php b/src/PHPCensor/ZeroConfigPluginInterface.php index 23092371..c258fe82 100644 --- a/src/PHPCensor/ZeroConfigPluginInterface.php +++ b/src/PHPCensor/ZeroConfigPluginInterface.php @@ -5,8 +5,6 @@ namespace PHPCensor; use PHPCensor\Model\Build; /** - * PHPCI Plugin Interface - Used by all build plugins. - * * @author Dan Cryer */ interface ZeroConfigPluginInterface diff --git a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php b/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php index 6f10551c..f7beba3b 100644 --- a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php +++ b/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php @@ -8,9 +8,8 @@ use PHPCensor\Plugin\Util\PhpUnitResultJunit; /** * Class PhpUnitResultTest parses the results for the PhpUnitV2 plugin - * @author Pablo Tejada - * @package PHPCI - * @subpackage Plugin + * + * @author Pablo Tejada */ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase { From e25639c874674d2129fe767e250bc91b3ce58635 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 21 Oct 2017 15:54:17 +0700 Subject: [PATCH 2/2] Updated dependencies. --- composer.json | 5 +- composer.lock | 389 ++++++++++++++++---------------------------------- 2 files changed, 125 insertions(+), 269 deletions(-) diff --git a/composer.json b/composer.json index 9f1d0115..02c68de2 100644 --- a/composer.json +++ b/composer.json @@ -65,8 +65,9 @@ "jakub-onderka/php-parallel-lint": "0.9.*", "sensiolabs/security-checker": "4.0.*", - "doctrine/instantiator": "1.0.*", - "phpunit/php-token-stream": "1.4.*", + "doctrine/instantiator": "1.0.*", + "phpunit/php-token-stream": "~1.0", + "phpdocumentor/reflection-docblock": "~2.0", "mnsami/composer-custom-directory-installer": "1.1.*", diff --git a/composer.lock b/composer.lock index adc4a162..bfdc8a1c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bbebceb0ee265f1093882c9049079052", + "content-hash": "211a9ef8c70d709f19b3ac593d3370fe", "packages": [ { "name": "behat/gherkin", @@ -203,16 +203,16 @@ }, { "name": "codeception/codeception", - "version": "2.3.5", + "version": "2.3.6", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "e807cd458eb9f7ae7464f33ad835a2f54aa73194" + "reference": "c3dd3b5d9e0b1ea6c2fcca52457736dc756716f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/e807cd458eb9f7ae7464f33ad835a2f54aa73194", - "reference": "e807cd458eb9f7ae7464f33ad835a2f54aa73194", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c3dd3b5d9e0b1ea6c2fcca52457736dc756716f8", + "reference": "c3dd3b5d9e0b1ea6c2fcca52457736dc756716f8", "shasum": "" }, "require": { @@ -227,7 +227,7 @@ "phpunit/phpunit": ">4.8.20 <7.0", "phpunit/phpunit-mock-objects": ">2.3 <5.0", "sebastian/comparator": ">1.1 <3.0", - "sebastian/diff": "^1.4", + "sebastian/diff": ">=1.4 <3.0", "stecman/symfony-console-completion": "^0.7.0", "symfony/browser-kit": ">=2.7 <4.0", "symfony/console": ">=2.7 <4.0", @@ -243,7 +243,6 @@ "flow/jsonpath": "~0.2", "league/factory-muffin": "^3.0", "league/factory-muffin-faker": "^1.0", - "mongodb/mongodb": "^1.0", "monolog/monolog": "~1.8", "pda/pheanstalk": "~3.0", "php-amqplib/php-amqplib": "~2.4", @@ -294,20 +293,20 @@ "functional testing", "unit testing" ], - "time": "2017-08-10T20:28:02+00:00" + "time": "2017-09-28T23:19:49+00:00" }, { "name": "composer/ca-bundle", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12" + "reference": "9dd73a03951357922d8aee6cc084500de93e2343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", - "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9dd73a03951357922d8aee6cc084500de93e2343", + "reference": "9dd73a03951357922d8aee6cc084500de93e2343", "shasum": "" }, "require": { @@ -353,7 +352,7 @@ "ssl", "tls" ], - "time": "2017-03-06T11:59:08+00:00" + "time": "2017-09-11T07:24:36+00:00" }, { "name": "doctrine/instantiator", @@ -818,37 +817,40 @@ }, { "name": "myclabs/deep-copy", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" }, "type": "library", "autoload": { "psr-4": { "DeepCopy\\": "src/DeepCopy/" - } + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", "keywords": [ "clone", "copy", @@ -856,20 +858,20 @@ "object", "object graph" ], - "time": "2017-04-12T18:52:22+00:00" + "time": "2017-10-19T19:58:43+00:00" }, { "name": "nikic/php-parser", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4d4896e553f2094e657fe493506dc37c509d4e2b" + "reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4d4896e553f2094e657fe493506dc37c509d4e2b", - "reference": "4d4896e553f2094e657fe493506dc37c509d4e2b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a1e8e1a30e1352f118feff1a8481066ddc2f234a", + "reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a", "shasum": "" }, "require": { @@ -907,7 +909,7 @@ "parser", "php" ], - "time": "2017-07-28T14:45:09+00:00" + "time": "2017-09-02T17:10:46+00:00" }, { "name": "npm-asset/codemirror", @@ -1021,136 +1023,39 @@ "description": "Official version of pdepend to be handled with Composer", "time": "2017-01-19T14:23:36+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27T11:43:31+00:00" - }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "2.0.5", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", - "webmozart/assert": "^1.0" + "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "phpunit/phpunit": "~4.0" }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ + "psr-0": { + "phpDocumentor": [ "src/" ] } @@ -1162,10 +1067,10 @@ "authors": [ { "name": "Mike van Riel", - "email": "me@mikevanriel.com" + "email": "mike.vanriel@naenius.com" } ], - "time": "2017-06-03T08:32:36+00:00" + "time": "2016-01-25T08:17:30+00:00" }, { "name": "phploc/phploc", @@ -1284,22 +1189,22 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -1310,7 +1215,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1343,7 +1248,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1596,16 +1501,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.21", + "version": "5.7.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" + "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", - "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78532d5269d984660080d8e0f4c99c5c2ea65ffe", + "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe", "shasum": "" }, "require": { @@ -1674,7 +1579,7 @@ "testing", "xunit" ], - "time": "2017-06-21T08:11:54+00:00" + "time": "2017-10-15T06:13:55+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2864,16 +2769,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "aee7120b058c268363e606ff5fe8271da849a1b5" + "reference": "317d5bdf0127f06db7ea294186132b4f5b036839" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/aee7120b058c268363e606ff5fe8271da849a1b5", - "reference": "aee7120b058c268363e606ff5fe8271da849a1b5", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/317d5bdf0127f06db7ea294186132b4f5b036839", + "reference": "317d5bdf0127f06db7ea294186132b4f5b036839", "shasum": "" }, "require": { @@ -2917,20 +2822,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/config", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488" + "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", - "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", + "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd", + "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd", "shasum": "" }, "require": { @@ -2979,20 +2884,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-08-03T08:59:45+00:00" + "time": "2017-10-04T18:56:58+00:00" }, { "name": "symfony/console", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6" + "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d6596cb5022b6a0bd940eae54a1de78646a5fda6", - "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6", + "url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c", + "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c", "shasum": "" }, "require": { @@ -3047,20 +2952,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:52:21+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c5f5263ed231f164c58368efbce959137c7d9488" + "reference": "07447650225ca9223bd5c97180fe7c8267f7d332" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c5f5263ed231f164c58368efbce959137c7d9488", - "reference": "c5f5263ed231f164c58368efbce959137c7d9488", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/07447650225ca9223bd5c97180fe7c8267f7d332", + "reference": "07447650225ca9223bd5c97180fe7c8267f7d332", "shasum": "" }, "require": { @@ -3100,20 +3005,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/debug", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d" + "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/084d804fe35808eb2ef596ec83d85d9768aa6c9d", - "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d", + "url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", + "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", "shasum": "" }, "require": { @@ -3156,20 +3061,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:52:21+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2ac658972626c75cbde7b0067c84b988170a6907" + "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ac658972626c75cbde7b0067c84b988170a6907", - "reference": "2ac658972626c75cbde7b0067c84b988170a6907", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8ebad929aee3ca185b05f55d9cc5521670821ad1", + "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1", "shasum": "" }, "require": { @@ -3226,20 +3131,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-08-28T22:20:37+00:00" + "time": "2017-10-04T17:15:30+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "d15dfaf71b65bf3affb80900470caf4451a8217e" + "reference": "40dafd42d5dad7fe5ad4e958413d92a207522ac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d15dfaf71b65bf3affb80900470caf4451a8217e", - "reference": "d15dfaf71b65bf3affb80900470caf4451a8217e", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/40dafd42d5dad7fe5ad4e958413d92a207522ac1", + "reference": "40dafd42d5dad7fe5ad4e958413d92a207522ac1", "shasum": "" }, "require": { @@ -3282,20 +3187,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-08-15T13:31:09+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "54ca9520a00386f83bca145819ad3b619aaa2485" + "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54ca9520a00386f83bca145819ad3b619aaa2485", - "reference": "54ca9520a00386f83bca145819ad3b619aaa2485", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d7ba037e4b8221956ab1e221c73c9e27e05dd423", + "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423", "shasum": "" }, "require": { @@ -3345,20 +3250,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb" + "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", - "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", + "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", "shasum": "" }, "require": { @@ -3394,20 +3299,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-03T13:33:10+00:00" }, { "name": "symfony/finder", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e" + "reference": "773e19a491d97926f236942484cb541560ce862d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", - "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", + "url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d", + "reference": "773e19a491d97926f236942484cb541560ce862d", "shasum": "" }, "require": { @@ -3443,20 +3348,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", "shasum": "" }, "require": { @@ -3468,7 +3373,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -3502,20 +3407,20 @@ "portable", "shim" ], - "time": "2017-06-14T15:44:48+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/process", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0" + "reference": "fdf89e57a723a29baf536e288d6e232c059697b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", + "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1", + "reference": "fdf89e57a723a29baf536e288d6e232c059697b1", "shasum": "" }, "require": { @@ -3551,20 +3456,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-02T06:42:24+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0" + "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0", - "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", + "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", "shasum": "" }, "require": { @@ -3606,7 +3511,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2017-10-05T14:43:42+00:00" }, { "name": "theseer/fdomdocument", @@ -3647,56 +3552,6 @@ "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", "time": "2017-06-30T11:53:12+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23T20:04:58+00:00" } ], "packages-dev": [],