Skip to content

Commit 0220728

Browse files
iMattPromichaelcullum
authored andcommitted
Remove EPV as dependency; run as a phpBB dep in tests
Closes #13
1 parent e0a3495 commit 0220728

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"symfony/finder": "2.8.*"
1818
},
1919
"require-dev": {
20-
"phing/phing": "2.4.*",
21-
"phpbb/epv": "dev-master"
20+
"phing/phing": "2.4.*"
2221
},
2322
"extra": {
2423
"display-name": "phpBB Skeleton Extension",

helper/packager.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,6 @@ public function get_composer_json_from_data($data)
235235
'require' => array(
236236
'php' => "{$data['requirements']['php_version']}",
237237
),
238-
'require-dev' => array(
239-
'phpbb/epv' => 'dev-master',
240-
),
241238
'extra' => array(
242239
'display-name' => "{$data['extension']['extension_display_name']}",
243240
'soft-require' => array(

skeleton/.travis.yml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ branches:
4242
- /^\d+(\.\d+)?\.x$/
4343

4444
install:
45-
- composer install --dev --no-interaction --prefer-source
4645
- travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
4746
- cd ../../phpBB3
4847
- travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
4948
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
49+
- sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then cd phpBB; composer require phpbb/epv:dev-master --dev --no-interaction; cd ../; fi"
5050

5151
before_script:
5252
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
@@ -55,4 +55,4 @@ script:
5555
- sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
5656
- sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
5757
- phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
58-
- sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
58+
- sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"

0 commit comments

Comments
 (0)