OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #866 from acelaya-forks/feature/composer-2

Browse Source 
Updated to composer 2
This commit is contained in:
Alejandro Celaya 2020-10-26 19:47:35 +01:00 committed by GitHub
commit 86d428184e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -47,7 +47,7 @@ before_install:
- yes | pecl install pdo_sqlsrv-5.9.0preview1 swoole-4.5.5 pcov - yes | pecl install pdo_sqlsrv-5.9.0preview1 swoole-4.5.5 pcov
install: install:
- composer self-update --1 - composer self-update
- composer install --no-interaction --prefer-dist $COMPOSER_FLAGS - composer install --no-interaction --prefer-dist $COMPOSER_FLAGS
before_script: before_script:

2
Dockerfile
View File

@ -44,7 +44,7 @@ RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \
# Install shlink # Install shlink
FROM base as builder FROM base as builder
COPY . . COPY . .
COPY --from=composer:1.10.13 /usr/bin/composer ./composer.phar COPY --from=composer:2 /usr/bin/composer ./composer.phar
RUN apk add --no-cache git && \ RUN apk add --no-cache git && \
php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \ php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
php composer.phar clear-cache && \ php composer.phar clear-cache && \

1
composer.json
View File

@ -27,7 +27,6 @@
"guzzlehttp/guzzle": "^7.0", "guzzlehttp/guzzle": "^7.0",
"laminas/laminas-config": "^3.3", "laminas/laminas-config": "^3.3",
"laminas/laminas-config-aggregator": "^1.1", "laminas/laminas-config-aggregator": "^1.1",
"laminas/laminas-dependency-plugin": "^1.0",
"laminas/laminas-diactoros": "^2.1.3", "laminas/laminas-diactoros": "^2.1.3",
"laminas/laminas-inputfilter": "^2.10", "laminas/laminas-inputfilter": "^2.10",
"laminas/laminas-paginator": "^2.8", "laminas/laminas-paginator": "^2.8",

2
data/infra/php.Dockerfile
View File

@ -64,7 +64,7 @@ RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8
rm msodbcsql17_17.5.1.1-1_amd64.apk rm msodbcsql17_17.5.1.1-1_amd64.apk
# Install composer # Install composer
COPY --from=composer:1.10.13 /usr/bin/composer /usr/local/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
# Make home directory writable by anyone # Make home directory writable by anyone
RUN chmod 777 /home RUN chmod 777 /home

2
data/infra/swoole.Dockerfile
View File

@ -76,7 +76,7 @@ RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8
rm msodbcsql17_17.5.1.1-1_amd64.apk rm msodbcsql17_17.5.1.1-1_amd64.apk
# Install composer # Install composer
COPY --from=composer:1.10.13 /usr/bin/composer /usr/local/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
# Make home directory writable by anyone # Make home directory writable by anyone
RUN chmod 777 /home RUN chmod 777 /home

4
module/CLI/test/Command/Visit/LocateVisitsCommandTest.php
View File

@ -94,9 +94,9 @@ class LocateVisitsCommandTest extends TestCase
self::assertStringContainsString('Processing IP 1.2.3.0', $output); self::assertStringContainsString('Processing IP 1.2.3.0', $output);
if ($expectWarningPrint) { if ($expectWarningPrint) {
self::assertStringContainsString('Continue at your own risk', $output); self::assertStringContainsString('Continue at your own', $output);
} else { } else {
self::assertStringNotContainsString('Continue at your own risk', $output); self::assertStringNotContainsString('Continue at your own', $output);
} }
$locateVisits->shouldHaveBeenCalledTimes($expectedUnlocatedCalls); $locateVisits->shouldHaveBeenCalledTimes($expectedUnlocatedCalls);
$locateEmptyVisits->shouldHaveBeenCalledTimes($expectedEmptyCalls); $locateEmptyVisits->shouldHaveBeenCalledTimes($expectedEmptyCalls);