From 418ca1462d257a7082818386616049c000591d71 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Mon, 8 Feb 2016 18:23:59 -0500 Subject: [PATCH 1/2] Add make target to update composer.lock Allows developers to update the engine's PHP dependencies without requiring a local PHP environment. Assumes a codeclimate-phpmd image is present, within which to run the composer.phar update. --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 47c486b..dc9047c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,13 @@ -.PHONY: image +.PHONY: image composer-update IMAGE_NAME ?= codeclimate/codeclimate-phpmd image: - docker build --tag codeclimate/codeclimate-phpmd . + docker build --tag $(IMAGE_NAME) . + +composer-update: + docker run \ + --rm \ + --volume $(PWD)/composer.json:/usr/src/app/composer.json:ro \ + $(IMAGE_NAME) \ + sh -c 'php composer.phar update && cat composer.lock' > composer.lock From 0c5525fa40ae1e905e2e664851de95ccfbe7f8a4 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Mon, 8 Feb 2016 18:25:04 -0500 Subject: [PATCH 2/2] Update to latest PHPMD (2.3.2) --- composer.json | 2 +- composer.lock | 135 ++++++++++++++++++++++++++------------------------ 2 files changed, 72 insertions(+), 65 deletions(-) diff --git a/composer.json b/composer.json index 44ca9c3..96f487e 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "phpmd/phpmd": "2.2.3", + "phpmd/phpmd": "2.3.2", "barracudanetworks/forkdaemon-php": "1.0.*" } } diff --git a/composer.lock b/composer.lock index b2d5225..b7dce60 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,24 @@ { "_readme": [ "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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "769f093b0b48da0d80a8a36f288c52c6", + "hash": "9a209cc69d52ac030e11b8a2f1a32b6b", + "content-hash": "b10e93343b0c2899b3e44cba4f40d95a", "packages": [ { "name": "barracudanetworks/forkdaemon-php", - "version": "v1.0.2", + "version": "v1.0.7", "source": { "type": "git", "url": "https://github.com/barracudanetworks/forkdaemon-php.git", - "reference": "9ca340a3c5f873dd731e0f1df2d79c16b1efd0d8" + "reference": "9f9402909a4bd1ac98e5aacb6f15f19056f591f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barracudanetworks/forkdaemon-php/zipball/9ca340a3c5f873dd731e0f1df2d79c16b1efd0d8", - "reference": "9ca340a3c5f873dd731e0f1df2d79c16b1efd0d8", + "url": "https://api.github.com/repos/barracudanetworks/forkdaemon-php/zipball/9f9402909a4bd1ac98e5aacb6f15f19056f591f6", + "reference": "9f9402909a4bd1ac98e5aacb6f15f19056f591f6", "shasum": "" }, "require": { @@ -25,7 +26,7 @@ }, "type": "library", "autoload": { - "files": [ + "classmap": [ "fork_daemon.php" ] }, @@ -40,30 +41,31 @@ "forking", "php" ], - "time": "2015-05-01 13:48:28" + "time": "2016-01-12 19:40:56" }, { "name": "pdepend/pdepend", - "version": "2.1.0", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "f58902a774449f73f1a1d9cd1a07aeac8fbee367" + "reference": "d3ae0d084d526cdc6c3f1b858fb7148de77b41c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f58902a774449f73f1a1d9cd1a07aeac8fbee367", - "reference": "f58902a774449f73f1a1d9cd1a07aeac8fbee367", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/d3ae0d084d526cdc6c3f1b858fb7148de77b41c5", + "reference": "d3ae0d084d526cdc6c3f1b858fb7148de77b41c5", "shasum": "" }, "require": { - "symfony/config": ">=2.4", - "symfony/dependency-injection": ">=2.4", - "symfony/filesystem": ">=2.4" + "php": ">=5.3.7", + "symfony/config": "^2.3.0", + "symfony/dependency-injection": "^2.3.0", + "symfony/filesystem": "^2.3.0" }, "require-dev": { - "phpunit/phpunit": "4.*@stable", - "squizlabs/php_codesniffer": "@stable" + "phpunit/phpunit": "^4.0.0,<4.8", + "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ "src/bin/pdepend" @@ -79,32 +81,29 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2015-05-21 18:09:06" + "time": "2015-10-16 08:49:58" }, { "name": "phpmd/phpmd", - "version": "2.2.3", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "5eeb5a4d39c8304910b33ae49f8813905346cc35" + "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/5eeb5a4d39c8304910b33ae49f8813905346cc35", - "reference": "5eeb5a4d39c8304910b33ae49f8813905346cc35", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b5bcd454a7148579b68931fc500d824afd3bb5", + "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5", "shasum": "" }, "require": { "pdepend/pdepend": "~2.0", - "php": ">=5.3.0", - "symfony/config": ">=2.4", - "symfony/dependency-injection": ">=2.4", - "symfony/filesystem": ">=2.4" + "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "*", - "squizlabs/php_codesniffer": "*" + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.0" }, "bin": [ "src/bin/phpmd" @@ -130,6 +129,12 @@ "name": "Other contributors", "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", "role": "Contributors" + }, + { + "name": "Marc Würth", + "email": "ravage@bluewin.ch", + "homepage": "https://github.com/ravage84", + "role": "Project Maintainer" } ], "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", @@ -141,39 +146,39 @@ "phpmd", "pmd" ], - "time": "2015-05-27 18:16:57" + "time": "2015-09-24 14:37:49" }, { "name": "symfony/config", - "version": "v2.7.3", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/symfony/Config.git", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9" + "url": "https://github.com/symfony/config.git", + "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/6c905bbed1e728226de656e4c07d620dfe9e80d9", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9", + "url": "https://api.github.com/repos/symfony/config/zipball/41ee6c70758f40fa1dbf90d019ae0a66c4a09e74", + "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/filesystem": "~2.3" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" + "symfony/filesystem": "~2.3|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -191,20 +196,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2016-01-03 15:33:41" }, { "name": "symfony/dependency-injection", - "version": "v2.7.3", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6" + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6", - "reference": "851e3ffe8a366b1590bdaf3df2c1395f2d27d8a6", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ba94a914e244e0d05f0aaef460d5558d5541d2b1", + "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1", "shasum": "" }, "require": { @@ -214,10 +219,9 @@ "symfony/expression-language": "<2.6" }, "require-dev": { - "symfony/config": "~2.2", - "symfony/expression-language": "~2.6", - "symfony/phpunit-bridge": "~2.7", - "symfony/yaml": "~2.1" + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/yaml": "~2.1|~3.0.0" }, "suggest": { "symfony/config": "", @@ -227,13 +231,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -251,38 +258,38 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2015-07-28 14:07:07" + "time": "2016-01-12 17:46:01" }, { "name": "symfony/filesystem", - "version": "v2.7.3", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8" + "url": "https://github.com/symfony/filesystem.git", + "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/637b64d0ee10f44ae98dbad651b1ecdf35a11e8c", + "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Filesystem\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -300,7 +307,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2016-01-13 10:28:07" } ], "packages-dev": [],