Skip to content

Commit 480699c

Browse files
authored
Merge pull request #72 from VSEphpbb/epv
EPV fixes
2 parents 696e3db + 0f386ca commit 480699c

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

helper/packager.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ class packager
3535
/** @var service_collection */
3636
protected $collection;
3737

38+
/** @var string */
39+
protected $root_path;
40+
3841
/**
3942
* Constructor
4043
*

skeleton/.travis.yml.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ install:
4848
- cd ../../phpBB3
4949
- travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
5050
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
51-
- sh -c "if [ '$EPV' != '0' -a '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' ]; then cd phpBB; composer require phpbb/epv:0.0.8 --dev --no-interaction; cd ../; fi"
51+
- sh -c "if [ '$EPV' != '0' -a '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' ]; then cd phpBB; composer remove sami/sami --dev --no-interaction; composer require phpbb/epv:dev-master --dev --no-interaction --ignore-platform-reqs; cd ../; fi"
5252

5353
before_script:
5454
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
@@ -108,7 +108,7 @@ install:
108108
- cd ../../phpBB3
109109
- travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
110110
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
111-
- sh -c "if [ '$EPV' == '1' -a '$NOTESTS' = '1' ]; then cd phpBB; composer remove sami/sami --dev --no-interaction; composer require phpbb/epv:dev-master --dev --no-interaction --ignore-platform-reqs; cd ../; fi"
111+
- sh -c "if [ '$EPV' = '1' -a '$NOTESTS' = '1' ]; then cd phpBB; composer remove sami/sami --dev --no-interaction; composer require phpbb/epv:dev-master --dev --no-interaction --ignore-platform-reqs; cd ../; fi"
112112

113113
before_script:
114114
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS

0 commit comments

Comments
 (0)