Skip to content

Commit

Permalink
Added legacy extensions to composer.json
Browse files Browse the repository at this point in the history
- Ensure that setup wizard enables them.
- Ensure only kernel tests are run by Travis
  • Loading branch information
lolautruche committed Jun 12, 2014
1 parent 6d65069 commit eec5de0
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ before_script:


script:
- php -d date.timezone=$TIMEZONE tests/runtests.php --dsn "$DB://${DB_USER}@127.0.0.1/$DB_NAME"
- php -d date.timezone=$TIMEZONE tests/runtests.php --dsn "$DB://${DB_USER}@127.0.0.1/$DB_NAME" tests extension/ezoe

notification:
email: false
Expand Down
15 changes: 15 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@
"ext-spl": "*",
"ext-simplexml": "*",
"ezsystems/ezpublish-legacy-installer": "*",
"ezsystems/ezautosave-ls": "~5.3",
"ezsystems/ezdemo-ls-extension": "~5.3",
"ezsystems/ezflow-ls-extension": "~5.3",
"ezsystems/ezgmaplocation-ls-extension": "~5.3",
"ezsystems/ezie-ls": "~5.3",
"ezsystems/ezmbpaex-ls": "~5.3",
"ezsystems/ezmultiupload-ls": "~5.3",
"ezsystems/ezodf-ls": "~5.3",
"ezsystems/ezprestapiprovider-ls": "~5.3",
"ezsystems/ezscriptmonitor-ls": "~5.3",
"ezsystems/ezsi-ls": "~5.3",
"ezsystems/ezstarrating-ls-extension": "~5.3",
"ezsystems/ezwt-ls-extension": "~5.3",
"ezsystems/ezfind-ls": "~5.3|>=2014.05",
"ezsystems/eztags-ls": "~1.3",
"zetacomponents/archive": "dev-master#d0caff8",
"zetacomponents/authentication": "dev-master#c422670",
"zetacomponents/authentication-database-tiein": "dev-master#56d1e0a",
Expand Down
7 changes: 6 additions & 1 deletion kernel/setup/steps/ezstep_create_sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,12 @@ function initializePackage( // $package,
$extensionsToEnable = array();
// Included in "fat" install, needs to override $extraCommonSettings extensions
$extensionsPrepended = array( 'ezjscore', /*@EZP_BUILD_EXTENSION_ACTIVATE@*/ 'ezoe', 'ezformtoken' );
foreach ( array( 'ezie', 'ezodf', 'ezprestapiprovider' ) as $extension )
foreach (
array(
'ezie', 'ezodf', 'ezprestapiprovider', 'ezmultiupload', 'eztags',
'ezautosave', 'ez_network', 'ez_network_demo'
) as $extension
)
{
if ( file_exists( "extension/$extension" ) )
{
Expand Down

0 comments on commit eec5de0

Please sign in to comment.