Merge remote-tracking branch 'ezplatform-ee/2.5' into 2.5

ezsystems · Feb 24, 2021 · 7f048db · 7f048db
2 parents 090ffcc + 203ecc7
commit 7f048db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bin/.travis/trusty/setup_ezplatform.sh b/bin/.travis/trusty/setup_ezplatform.sh
@@ -70,8 +70,12 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
     cd -
 
     # use local checkout path relative to docker volume
+    # create the directory for non-container commands to pass
+    if [ ! -d /var/www/${BASE_PACKAGE_NAME} ]; then
+        sudo mkdir -p /var/www/${BASE_PACKAGE_NAME}
+    fi
     echo "> Make composer use tested dependency local checkout ${TMP_TRAVIS_BRANCH} of ${BASE_PACKAGE_NAME}"
-    composer config repositories.localDependency git /var/www/${BASE_PACKAGE_NAME}
+    composer config repositories.localDependency path /var/www/${BASE_PACKAGE_NAME}
 
     echo "> Require ${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"
     if ! composer require --no-update "${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"; then

diff --git a/composer.json b/composer.json
@@ -65,7 +65,6 @@
         "overblog/graphql-bundle": "^0.11.11",
         "scssphp/scssphp": "~1.0",
         "sensio/distribution-bundle": "^5.0.25",
-        "sensiolabs/security-checker": "^5.0",
         "symfony/assetic-bundle": "^2.8.2",
         "symfony/monolog-bundle": "^3.3.1",
         "symfony/swiftmailer-bundle": "^3.2.4",
@@ -110,8 +109,7 @@
             "@php bin/console bazinga:js-translation:dump web/assets --merge-domains",
             "@php bin/console assetic:dump",
             "yarn install",
-            "EzSystems\\EzPlatformEncoreBundle\\Composer\\ScriptHandler::compileAssets",
-            "@php bin/security-checker security:check || true"
+            "EzSystems\\EzPlatformEncoreBundle\\Composer\\ScriptHandler::compileAssets"
         ],
         "post-install-cmd": [
             "@symfony-scripts"