From 11c73360c8087eee03bf45743130ea56fe3a0f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Tue, 2 Dec 2014 20:25:24 +0100 Subject: [PATCH 1/5] Enhancement: Require phpmd/phpmd as dev dependency --- composer.json | 1 + composer.lock | 230 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 230 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 92d3e47c..3d4e7ddb 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "socalnick/scn-social-auth": "1.14.1" }, "require-dev": { + "phpmd/phpmd": "~2.1", "phpunit/phpunit": "4.0.*", "bjyoungblood/BjyProfiler": "1.1.0", "squizlabs/php_codesniffer": "~2.0.0@RC", diff --git a/composer.lock b/composer.lock index a23db43a..42c55012 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "90dbdd8e3e9bd3a28a410fbc912cfc96", + "hash": "882e35a30d5de6dbec7adb34dc7ae77b", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -971,6 +971,82 @@ ], "time": "2014-03-11 13:42:24" }, + { + "name": "pdepend/pdepend", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1b0acf162da4f30237987e61e177a57f78e3d87e", + "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e", + "shasum": "" + }, + "require": { + "symfony/config": ">=2.4", + "symfony/dependency-injection": ">=2.4", + "symfony/filesystem": ">=2.4" + }, + "require-dev": { + "phpunit/phpunit": "4.*@stable", + "squizlabs/php_codesniffer": "@stable" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "autoload": { + "psr-0": { + "PDepend\\": "src/main/php/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "time": "2014-12-04 12:38:39" + }, + { + "name": "phpmd/phpmd", + "version": "2.1.3", + "source": { + "type": "git", + "url": "https://github.com/phpmd/phpmd.git", + "reference": "1a485d9db869137af5e9678bd844568c92998b25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1a485d9db869137af5e9678bd844568c92998b25", + "reference": "1a485d9db869137af5e9678bd844568c92998b25", + "shasum": "" + }, + "require": { + "pdepend/pdepend": "2.0.*", + "php": ">=5.3.0", + "symfony/config": "2.5.*", + "symfony/dependency-injection": "2.5.*", + "symfony/filesystem": "2.5.*" + }, + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "autoload": { + "psr-0": { + "PHPMD\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of PHPMD handled with Composer.", + "time": "2014-09-25 15:56:22" + }, { "name": "phpunit/php-code-coverage", "version": "2.0.x-dev", @@ -1623,6 +1699,158 @@ ], "time": "2014-12-05 00:14:12" }, + { + "name": "symfony/config", + "version": "2.5.x-dev", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config.git", + "reference": "b349eea3271d2d94cf2faa158c10a8faa2de11eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Config/zipball/b349eea3271d2d94cf2faa158c10a8faa2de11eb", + "reference": "b349eea3271d2d94cf2faa158c10a8faa2de11eb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/filesystem": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Config\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com", + "time": "2014-12-11 19:53:06" + }, + { + "name": "symfony/dependency-injection", + "version": "2.5.x-dev", + "target-dir": "Symfony/Component/DependencyInjection", + "source": { + "type": "git", + "url": "https://github.com/symfony/DependencyInjection.git", + "reference": "b0fee57915acaf8dc67527696f46f5133b9c3167" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b0fee57915acaf8dc67527696f46f5133b9c3167", + "reference": "b0fee57915acaf8dc67527696f46f5133b9c3167", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": "~2.2", + "symfony/expression-language": "~2.4", + "symfony/yaml": "~2.0" + }, + "suggest": { + "symfony/config": "", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\DependencyInjection\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "http://symfony.com", + "time": "2014-12-11 19:53:06" + }, + { + "name": "symfony/filesystem", + "version": "2.5.x-dev", + "target-dir": "Symfony/Component/Filesystem", + "source": { + "type": "git", + "url": "https://github.com/symfony/Filesystem.git", + "reference": "f975c637ab3e874b19123b63a5b20766691f4835" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/f975c637ab3e874b19123b63a5b20766691f4835", + "reference": "f975c637ab3e874b19123b63a5b20766691f4835", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "http://symfony.com", + "time": "2014-12-04 20:26:11" + }, { "name": "symfony/yaml", "version": "2.7.x-dev", From ced978ade8750895b53a5834267ef00890c601b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Tue, 2 Dec 2014 20:26:28 +0100 Subject: [PATCH 2/5] Enhancement: Run phpmd on Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fbaa3e0d..232fe978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ install: script: - ./vendor/bin/phpcs --standard=./phpcs.xml -np --report=summary . + - ./vendor/bin/phpmd . text codesize,unusedcode --exclude data,puphpet,vendor - ./vendor/bin/phpunit --configuration phpunit.xml notifications: From 24de82ba699b854d0811a83148f37bb70299b13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Fri, 12 Dec 2014 22:04:45 +0100 Subject: [PATCH 3/5] Fix: Suppress warning in regard to unused parameter --- module/User/src/User/Module.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/User/src/User/Module.php b/module/User/src/User/Module.php index 11e317bc..79a47d70 100644 --- a/module/User/src/User/Module.php +++ b/module/User/src/User/Module.php @@ -8,6 +8,12 @@ class Module extends AbstractModule { + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * + * @param ModuleManager $moduleManager + * @param ApplicationInterface $app + */ public function bootstrap(ModuleManager $moduleManager, ApplicationInterface $app) { $em = $app->getEventManager()->getSharedManager(); From 03e0d88430e4467eace6d72ead18cf34ff624414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Fri, 12 Dec 2014 22:06:25 +0100 Subject: [PATCH 4/5] Fix: Remove unused parameter --- module/User/src/User/View/Helper/UserRepositories.php | 8 ++------ module/ZfModule/src/ZfModule/View/Helper/NewModule.php | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/module/User/src/User/View/Helper/UserRepositories.php b/module/User/src/User/View/Helper/UserRepositories.php index 0c0910aa..c3434442 100644 --- a/module/User/src/User/View/Helper/UserRepositories.php +++ b/module/User/src/User/View/Helper/UserRepositories.php @@ -29,13 +29,9 @@ class UserRepositories extends AbstractHelper implements ServiceLocatorAwareInte protected $events; /** - * __invoke - * - * @access public - * @param array $options array of options - * @return string + * @return array */ - public function __invoke($options = array()) + public function __invoke() { $sl = $this->getServiceLocator(); diff --git a/module/ZfModule/src/ZfModule/View/Helper/NewModule.php b/module/ZfModule/src/ZfModule/View/Helper/NewModule.php index d9e5bce4..0ed033df 100644 --- a/module/ZfModule/src/ZfModule/View/Helper/NewModule.php +++ b/module/ZfModule/src/ZfModule/View/Helper/NewModule.php @@ -22,13 +22,9 @@ public function __construct(Mapper\Module $moduleMapper) } /** - * __invoke - * - * @access public - * @param array $options array of options - * @return array Array of modules + * @return string */ - public function __invoke($options = null) + public function __invoke() { $modules = $this->moduleMapper->findAll(10, 'created_at', 'DESC'); From 389551e137a767f382174bc099a2fcf440bbd040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Sat, 13 Dec 2014 15:53:48 +0100 Subject: [PATCH 5/5] Fix: Suppress warning in regard to unused formal parameter --- module/ZfModule/src/ZfModule/Mapper/Module.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/ZfModule/src/ZfModule/Mapper/Module.php b/module/ZfModule/src/ZfModule/Mapper/Module.php index a0a901b3..0868bc2f 100644 --- a/module/ZfModule/src/ZfModule/Mapper/Module.php +++ b/module/ZfModule/src/ZfModule/Mapper/Module.php @@ -77,6 +77,9 @@ public function findByLike($query, $limit = null, $orderBy = null, $sort = 'ASC' return $entity; } + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) +g */ public function findByOwner($owner, $limit = null, $orderBy = null, $sort = 'ASC') { $select = $this->getSelect();