From f4782e02d2e609f931e1b6a5521e130dc1470bce Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 19 Aug 2014 17:44:02 -0700 Subject: [PATCH 1/2] Add EPV testing --- .travis.yml | 3 + composer.json | 3 + composer.lock | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 460 insertions(+) create mode 100644 composer.lock diff --git a/.travis.yml b/.travis.yml index fba2ed3..b062580 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ env: - EXTNAME="phpbb/googleanalytics" # CHANGE name of the extension HERE - SNIFF="1" # Should we run code sniffer on your code? - IMAGE_ICC="1" # Should we run icc profile sniffer on your images? + - EPV="1" # Should we run EPV (Extension Pre Validator) on your code? - PHPBB_BRANCH="develop-ascraeus" branches: @@ -40,6 +41,7 @@ branches: - /^develop-.*$/ install: + - composer install --dev --no-interaction --prefer-source - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH - cd ../../phpBB3 - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH @@ -52,3 +54,4 @@ script: - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi" - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi" - phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php + - sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.5' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi" diff --git a/composer.json b/composer.json index eededb6..966f1cf 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,9 @@ "php": ">=5.3.3", "composer/installers": "~1.0" }, + "require-dev": { + "phpbb/epv": "dev-master" + }, "extra": { "display-name": "Google Analytics", "soft-require": { diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..3de77d8 --- /dev/null +++ b/composer.lock @@ -0,0 +1,454 @@ +{ + "_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" + ], + "hash": "f7a61431d2a199f7a988c246345cb027", + "packages": [ + { + "name": "composer/installers", + "version": "v1.0.17", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "f22820dd0854a406f86e2fc29b81c1898d68e5fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/f22820dd0854a406f86e2fc29b81c1898d68e5fb", + "reference": "f22820dd0854a406f86e2fc29b81c1898d68e5fb", + "shasum": "" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" + }, + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Hurad", + "MODX Evo", + "OXID", + "WolfCMS", + "agl", + "annotatecms", + "bitrix", + "cakephp", + "chef", + "codeigniter", + "concrete5", + "croogo", + "drupal", + "elgg", + "fuelphp", + "installer", + "joomla", + "kohana", + "laravel", + "lithium", + "magento", + "mako", + "mediawiki", + "modulework", + "moodle", + "phpbb", + "piwik", + "ppi", + "puppet", + "roundcube", + "shopware", + "silverstripe", + "symfony", + "typo3", + "wordpress", + "zend", + "zikula" + ], + "time": "2014-08-17 18:19:30" + } + ], + "packages-dev": [ + { + "name": "gitonomy/gitlib", + "version": "v0.1.7", + "source": { + "type": "git", + "url": "https://github.com/gitonomy/gitlib.git", + "reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/7a46107cfb8552b312101e0d5906e95d54d7ddc6", + "reference": "7a46107cfb8552b312101e0d5906e95d54d7ddc6", + "shasum": "" + }, + "require": { + "symfony/process": "~2.4" + }, + "require-dev": { + "psr/log": "~1" + }, + "suggest": { + "psr/log": "Add some log" + }, + "type": "library", + "autoload": { + "psr-0": { + "Gitonomy\\Git": [ + "src/", + "tests/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexandre Salomé", + "email": "alexandre.salome@gmail.com", + "homepage": "http://alexandre-salome.fr" + }, + { + "name": "Julien DIDIER", + "email": "genzo.wm@gmail.com", + "homepage": "http://www.jdidier.net" + } + ], + "description": "Library for accessing git", + "homepage": "http://gitonomy.com", + "time": "2014-07-13 19:02:31" + }, + { + "name": "nikic/php-parser", + "version": "v0.9.5", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb", + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.9-dev" + } + }, + "autoload": { + "psr-0": { + "PHPParser": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2014-07-23 18:24:17" + }, + { + "name": "phpbb/epv", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/phpbb/epv.git", + "reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpbb/epv/zipball/4122e7329b683ac253ad99a90d1415e2ec83eb3a", + "reference": "4122e7329b683ac253ad99a90d1415e2ec83eb3a", + "shasum": "" + }, + "require": { + "gitonomy/gitlib": "0.1.*@dev", + "nikic/php-parser": "0.9.*@dev", + "php": ">=5.3.3", + "symfony/console": ">=2.3.0", + "symfony/finder": ">=2.3.0", + "symfony/yaml": ">=2.3.0|>=2.4.0|>=2.5.0" + }, + "require-dev": { + "phpunit/phpunit": "4.0.*" + }, + "bin": [ + "src/EPV.php" + ], + "type": "library", + "autoload": { + "psr-4": { + "Phpbb\\Epv\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Paul Sohier", + "email": "paul@phpbb.com" + } + ], + "description": "A extension validator for phpBB extensions. Extensions are required to pass the validator when submitted to the extension database.", + "time": "2014-08-16 16:29:34" + }, + { + "name": "symfony/console", + "version": "v2.5.3", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/cd2d1e4bac2206b337326b0140ff475fe9ad5f63", + "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Console\\": "" + } + }, + "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 Console Component", + "homepage": "http://symfony.com", + "time": "2014-08-05 09:00:40" + }, + { + "name": "symfony/finder", + "version": "v2.5.3", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "090fe4eaff414d8f2171c7a4748ea868d530775f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/090fe4eaff414d8f2171c7a4748ea868d530775f", + "reference": "090fe4eaff414d8f2171c7a4748ea868d530775f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder\\": "" + } + }, + "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 Finder Component", + "homepage": "http://symfony.com", + "time": "2014-07-28 13:20:46" + }, + { + "name": "symfony/process", + "version": "v2.5.3", + "target-dir": "Symfony/Component/Process", + "source": { + "type": "git", + "url": "https://github.com/symfony/Process.git", + "reference": "e0997d2a9a1a763484b34b989900b61322a9b056" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Process/zipball/e0997d2a9a1a763484b34b989900b61322a9b056", + "reference": "e0997d2a9a1a763484b34b989900b61322a9b056", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Process\\": "" + } + }, + "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 Process Component", + "homepage": "http://symfony.com", + "time": "2014-08-05 09:00:40" + }, + { + "name": "symfony/yaml", + "version": "v2.5.3", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", + "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml\\": "" + } + }, + "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 Yaml Component", + "homepage": "http://symfony.com", + "time": "2014-08-05 09:00:40" + } + ], + "aliases": [ + + ], + "minimum-stability": "stable", + "stability-flags": { + "phpbb/epv": 20 + }, + "platform": { + "php": ">=5.3.3" + }, + "platform-dev": [ + + ] +} From 99e3674319a35354156312af15a2ba0db0517c09 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 19 Aug 2014 17:44:10 -0700 Subject: [PATCH 2/2] Add gitattributes --- .gitattributes | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bb573d9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +tests/ export-ignore +travis/ export-ignore +.travis.yml export-ignore +.gitignore export-ignore +.gitattributes export-ignore +phpunit.xml.* export-ignore +composer.lock export-ignore