From df5600f0c109db0461cddd3aadfad54c2d9cb4a1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 17:11:21 +0100 Subject: [PATCH] Fixing composer.json and composer.lock after my breaking them in 69ea47874fc3d95698e5cdb2601bd4ef5ee8eb52. Thanks @elkangaroo --- composer.json | 57 ++++++- composer.lock | 429 +++----------------------------------------------- 2 files changed, 74 insertions(+), 412 deletions(-) diff --git a/composer.json b/composer.json index e6e9cbfb..a6dec175 100644 --- a/composer.json +++ b/composer.json @@ -1 +1,56 @@ -{"name":"block8\/phpci","description":"Simple continuous integration for PHP projects.","minimum-stability":"stable","type":"library","keywords":["php","phpci","ci","continuous","integration","testing","phpunit","continuous integration","jenkins","travis"],"homepage":"http:\/\/www.phptesting.org\/","license":"BSD-2-Clause","authors":[{"name":"Dan Cryer","email":"dan.cryer@block8.co.uk","homepage":"http:\/\/www.block8.co.uk","role":"Developer"}],"support":{"email":"hello+phpci@block8.co.uk","issues":"https:\/\/github.com\/Block8\/PHPCI\/issues","source":"https:\/\/github.com\/Block8\/PHPCI"},"require":{"php":">=5.3.3","ext-mcrypt":"*","ext-pdo":"*","ext-pdo_mysql":"*","block8\/b8framework":"~1.1","ircmaxell\/password-compat":"~1.0","swiftmailer\/swiftmailer":"~5.0","symfony\/yaml":"~2.1","symfony\/console":"~2.1","psr\/log":"~1.0","monolog\/monolog":"~1.6","pimple\/pimple":"~1.1","phpmd\/phpmd":"1.5.0","squizlabs\/php_codesniffer":"1.5.2","phploc\/phploc":"2.0.4"},"require-dev":{"phpunit\/phpunit":"~3.7","phpspec\/prophecy-phpunit":"~1.0"},"suggest":{"phpmd\/phpmd":"PHP Mess Detector","sebastian\/phpcpd":"PHP Copy\/Paste Detector","squizlabs\/php_codesniffer":"PHP Code Sniffer","phpspec\/phpspec":"PHP Spec","fabpot\/php-cs-fixer":"PHP Code Sniffer Fixer","phploc\/phploc":"PHP Lines of Code","atoum\/atoum":"Atoum","jakub-onderka\/php-parallel-lint":"Parallel Linting Tool","behat\/behat":"Behat BDD Testing"}} \ No newline at end of file +{ + "name" : "block8/phpci", + "description" : "Simple continuous integration for PHP projects.", + "minimum-stability": "stable", + "type" : "library", + "keywords" : ["php", "phpci", "ci", "continuous", "integration", "testing", "phpunit", "continuous integration", "jenkins", "travis"], + "homepage" : "http://www.phptesting.org/", + "license" : "BSD-2-Clause", + + "authors": [ + { + "name" : "Dan Cryer", + "email" : "dan.cryer@block8.co.uk", + "homepage": "http://www.block8.co.uk", + "role" : "Developer" + } + ], + + "support": { + "email" : "hello+phpci@block8.co.uk", + "issues": "https://github.com/Block8/PHPCI/issues", + "source": "https://github.com/Block8/PHPCI" + }, + + "require": { + "php": ">=5.3.3", + "ext-mcrypt": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*", + "block8/b8framework" : "~1.1", + "ircmaxell/password-compat": "~1.0", + "swiftmailer/swiftmailer" : "~5.0", + "symfony/yaml" : "~2.1", + "symfony/console" : "~2.1", + "psr/log": "~1.0", + "monolog/monolog": "~1.6", + "pimple/pimple": "~1.1" + }, + + "require-dev": { + "phpunit/phpunit": "~3.7", + "phpspec/prophecy-phpunit": "~1.0" + }, + + "suggest": { + "phpmd/phpmd": "PHP Mess Detector", + "sebastian/phpcpd": "PHP Copy/Paste Detector", + "squizlabs/php_codesniffer": "PHP Code Sniffer", + "phpspec/phpspec": "PHP Spec", + "fabpot/php-cs-fixer": "PHP Code Sniffer Fixer", + "phploc/phploc": "PHP Lines of Code", + "atoum/atoum": "Atoum", + "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", + "behat/behat": "Behat BDD Testing" + } +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index da803bb5..1110c4b5 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "c62206879ad9a7794cbb6d500be752a7", + "hash": "d6834b50e3ea80f4c6f0a05707d0e5f1", "packages": [ { "name": "block8/b8framework", @@ -159,119 +159,6 @@ ], "time": "2014-04-24 13:29:03" }, - { - "name": "pdepend/pdepend", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1537f19d62d7b30c13ac173270106df7c6b9c459", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459", - "shasum": "" - }, - "require": { - "php": ">=5.2.3" - }, - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "autoload": { - "psr-0": { - "PHP_": "src/main/php/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of pdepend to be handled with Composer", - "time": "2013-12-04 17:46:00" - }, - { - "name": "phploc/phploc", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phploc.git", - "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/2b3d3f4105cb16f78f5bdd77216b992dade053d0", - "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/finder-facade": ">=1.1.0", - "sebastian/git": ">=1.0.0", - "sebastian/version": ">=1.0.0", - "symfony/console": ">=2.2.0" - }, - "bin": [ - "composer/bin/phploc" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "A tool for quickly measuring the size of a PHP project.", - "homepage": "https://github.com/sebastianbergmann/phploc", - "time": "2013-12-18 08:31:50" - }, - { - "name": "phpmd/phpmd", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/phpmd/phpmd.git", - "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/692b7b1b64518091b2b1bea91b489dbb13598c07", - "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07", - "shasum": "" - }, - "require": { - "pdepend/pdepend": ">=1.1.1", - "php": ">=5.3.0" - }, - "bin": [ - "src/bin/phpmd" - ], - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "../../pdepend/pdepend/src/main/php", - "src/main/php" - ], - "description": "Official version of PHPMD handled with Composer.", - "time": "2013-07-26 14:47:02" - }, { "name": "pimple/pimple", "version": "v1.1.1", @@ -358,196 +245,6 @@ ], "time": "2012-12-21 11:40:51" }, - { - "name": "sebastian/finder-facade", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0", - "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0", - "shasum": "" - }, - "require": { - "symfony/finder": ">=2.2.0", - "theseer/fdomdocument": ">=1.3.1" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", - "homepage": "https://github.com/sebastianbergmann/finder-facade", - "time": "2013-05-28 06:10:03" - }, - { - "name": "sebastian/git", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/git.git", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple wrapper for Git", - "homepage": "http://www.github.com/sebastianbergmann/git", - "keywords": [ - "git" - ], - "time": "2013-08-04 09:35:29" - }, - { - "name": "sebastian/version", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-03-07 15:35:33" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "1.5.2", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "a76a39b317ce8106abe6264daa505e24e1731860" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a76a39b317ce8106abe6264daa505e24e1731860", - "reference": "a76a39b317ce8106abe6264daa505e24e1731860", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.1.2" - }, - "suggest": { - "phpunit/php-timer": "dev-master" - }, - "bin": [ - "scripts/phpcs" - ], - "type": "library", - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/CommentParser/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2014-02-04 23:49:58" - }, { "name": "swiftmailer/swiftmailer", "version": "v5.1.0", @@ -601,17 +298,17 @@ }, { "name": "symfony/console", - "version": "v2.4.3", + "version": "v2.4.4", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb" + "reference": "2e452005b1e1d003d23702d227e23614679eb5ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb", - "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb", + "url": "https://api.github.com/repos/symfony/Console/zipball/2e452005b1e1d003d23702d227e23614679eb5ca", + "reference": "2e452005b1e1d003d23702d227e23614679eb5ca", "shasum": "" }, "require": { @@ -652,70 +349,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-03-01 17:35:04" - }, - { - "name": "symfony/finder", - "version": "v2.4.3", - "target-dir": "Symfony/Component/Finder", - "source": { - "type": "git", - "url": "https://github.com/symfony/Finder.git", - "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/ab301c7d21f536c34ab6c2c79dba8d465104c518", - "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Finder\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "http://symfony.com", - "time": "2014-03-01 17:35:04" + "time": "2014-04-27 13:34:57" }, { "name": "symfony/yaml", - "version": "v2.4.3", + "version": "v2.4.4", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd" + "reference": "65539ecde838f9c0d18b006b2101e3deb4b5c9ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", - "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/65539ecde838f9c0d18b006b2101e3deb4b5c9ff", + "reference": "65539ecde838f9c0d18b006b2101e3deb4b5c9ff", "shasum": "" }, "require": { @@ -750,47 +398,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-03-12 18:29:58" - }, - { - "name": "theseer/fdomdocument", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/137aa3b13bef05b4e301899cbabdaf7d501847d2", - "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "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": "2014-02-19 00:20:43" + "time": "2014-04-18 20:37:09" } ], "packages-dev": [ @@ -1145,20 +753,22 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.35", + "version": "3.7.37", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "83f9537e46346f75ed6925441ac259453213c7cc" + "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83f9537e46346f75ed6925441ac259453213c7cc", - "reference": "83f9537e46346f75ed6925441ac259453213c7cc", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", + "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-dom": "*", + "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", @@ -1174,9 +784,6 @@ "pear-pear.php.net/pear": "1.9.4" }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -1215,7 +822,7 @@ "testing", "xunit" ], - "time": "2014-04-21 06:25:54" + "time": "2014-04-30 12:24:19" }, { "name": "phpunit/phpunit-mock-objects",