Skip to content

Commit

Permalink
Phing: platform reqs are ignored in composer
Browse files Browse the repository at this point in the history
- dependency friendsofphp/php-cs-fixer is not compatible with 7.3
  • Loading branch information
grossmannmartin committed Dec 21, 2018
1 parent 5f00112 commit 3696efa
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions build.xml
Expand Up @@ -30,6 +30,7 @@
</if>
<exec executable="${path.composer.executable}" logoutput="true" passthru="true" checkreturn="true">
<arg value="${composer.action}"/>
<arg value="--ignore-platform-reqs" />
</exec>
<phingcall target="composer-check" />
</target>
Expand Down
2 changes: 1 addition & 1 deletion microservices/product-search-export/docker/Dockerfile
Expand Up @@ -223,7 +223,7 @@ RUN composer global require hirak/prestissimo
# copy source code to the container
COPY --chown=www-data:www-data / /var/www/html

RUN composer install -o --no-dev
RUN composer install -o --no-dev --ignore-platform-reqs

########################################################################################################################

Expand Down
Expand Up @@ -4,10 +4,10 @@
# avoids the need to install them manually when using a mounted volume
if composer validate --no-check-all --no-check-publish; then
echo "The lock file is valid, installing dependencies..."
composer install
composer install --ignore-platform-reqs
else
echo "The lock file is invalid, updating dependencies..."
composer update
composer update --ignore-platform-reqs
fi

# warm up the Symfony cache
Expand Down
2 changes: 1 addition & 1 deletion microservices/product-search/docker/Dockerfile
Expand Up @@ -223,7 +223,7 @@ RUN composer global require hirak/prestissimo
# copy source code to the container
COPY --chown=www-data:www-data / /var/www/html

RUN composer install -o --no-dev
RUN composer install -o --no-dev --ignore-platform-reqs

########################################################################################################################

Expand Down
4 changes: 2 additions & 2 deletions microservices/product-search/docker/docker-cmd-development
Expand Up @@ -4,10 +4,10 @@
# avoids the need to install them manually when using a mounted volume
if composer validate --no-check-all --no-check-publish; then
echo "The lock file is valid, installing dependencies..."
composer install
composer install --ignore-platform-reqs
else
echo "The lock file is invalid, updating dependencies..."
composer update
composer update --ignore-platform-reqs
fi

# warm up the Symfony cache
Expand Down
1 change: 1 addition & 0 deletions project-base/build-dev.xml
Expand Up @@ -43,6 +43,7 @@
checkreturn="true"
>
<arg value="install"/>
<arg value="--ignore-platform-reqs" />
</exec>
</target>

Expand Down
1 change: 1 addition & 0 deletions project-base/build.xml
Expand Up @@ -109,6 +109,7 @@
>
<arg value="install" />
<arg value="--no-dev" />
<arg value="--ignore-platform-reqs" />
</exec>
</target>

Expand Down
4 changes: 2 additions & 2 deletions project-base/docker/php-fpm/Dockerfile
Expand Up @@ -100,7 +100,7 @@ FROM base as production

COPY --chown=www-data:www-data / /var/www/html

RUN composer install --optimize-autoloader --no-interaction --no-progress --no-dev
RUN composer install --optimize-autoloader --no-interaction --no-progress --no-dev --ignore-platform-reqs

RUN php phing composer npm dirs-create assets

Expand All @@ -110,7 +110,7 @@ FROM base as ci

COPY --chown=www-data:www-data / /var/www/html

RUN composer install --optimize-autoloader --no-interaction --no-progress --dev
RUN composer install --optimize-autoloader --no-interaction --no-progress --dev --ignore-platform-reqs

RUN php phing composer-dev npm dirs-create test-dirs-create assets standards tests-static tests-acceptance-build

Expand Down

0 comments on commit 3696efa

Please sign in to comment.