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 #1766 from acelaya-forks/feature/rr-cli-2.5

Browse Source 
Update to rr-cli 2.5, and do not generate config
This commit is contained in:
Alejandro Celaya 2023-05-02 20:01:51 +02:00 committed by GitHub
commit 9553192281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
- run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole - run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole
- run: ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr - run: ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr
- run: composer test:api:rr - run: composer test:api:rr
sqlite-db-tests: sqlite-db-tests:

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
.idea .idea
bin/.rr.*
bin/rr bin/rr
config/roadrunner/.pid config/roadrunner/.pid
build build

2
Dockerfile
View File

@ -62,7 +62,7 @@ LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
COPY --from=builder /etc/shlink . COPY --from=builder /etc/shlink .
RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \ RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \
if [ "$SHLINK_RUNTIME" == 'rr' ]; then \ if [ "$SHLINK_RUNTIME" == 'rr' ]; then \
php ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr ; \ php ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; \
fi; fi;
# Expose default port # Expose default port

2
composer.json
View File

@ -53,7 +53,7 @@
"shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-ip-geolocation": "^3.2",
"shlinkio/shlink-json": "^1.0", "shlinkio/shlink-json": "^1.0",
"spiral/roadrunner": "^2023.1", "spiral/roadrunner": "^2023.1",
"spiral/roadrunner-cli": "^2.4", "spiral/roadrunner-cli": "^2.5",
"spiral/roadrunner-http": "^3.0", "spiral/roadrunner-http": "^3.0",
"spiral/roadrunner-jobs": "^4.0", "spiral/roadrunner-jobs": "^4.0",
"symfony/console": "^6.2", "symfony/console": "^6.2",

2
data/infra/roadrunner.Dockerfile
View File

@ -71,6 +71,6 @@ CMD \
# Install dependencies if the vendor dir does not exist # Install dependencies if the vendor dir does not exist
if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \ if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \
# Download roadrunner binary # Download roadrunner binary
if [[ ! -f "./bin/rr" ]]; then ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr ; fi && \ if [[ ! -f "./bin/rr" ]]; then ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; fi && \
# This forces the app to be started every second until the exit code is 0 # This forces the app to be started every second until the exit code is 0
until ./bin/rr serve -c config/roadrunner/.rr.dev.yml; do sleep 1 ; done until ./bin/rr serve -c config/roadrunner/.rr.dev.yml; do sleep 1 ; done

2
module/Core/src/Util/UrlValidator.php
View File

@ -27,7 +27,7 @@ class UrlValidator implements UrlValidatorInterface, RequestMethodInterface
{ {
private const MAX_REDIRECTS = 15; private const MAX_REDIRECTS = 15;
private const CHROME_USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) ' private const CHROME_USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) '
. 'Chrome/108.0.0.0 Safari/537.36'; . 'Chrome/112.0.0.0 Safari/537.36';
public function __construct(private ClientInterface $httpClient, private UrlShortenerOptions $options) public function __construct(private ClientInterface $httpClient, private UrlShortenerOptions $options)
{ {

9
module/Rest/test-api/Action/CreateShortUrlTest.php
View File

@ -12,6 +12,7 @@ use Shlinkio\Shlink\TestUtils\ApiTest\ApiTestCase;
use function Functional\map; use function Functional\map;
use function range; use function range;
use function Shlinkio\Shlink\Config\env;
use function sprintf; use function sprintf;
class CreateShortUrlTest extends ApiTestCase class CreateShortUrlTest extends ApiTestCase
@ -320,8 +321,14 @@ class CreateShortUrlTest extends ApiTestCase
} }
#[Test, DataProvider('provideTwitterUrls')] #[Test, DataProvider('provideTwitterUrls')]
public function urlsWithBothProtectionCanBeShortenedWithUrlValidationEnabled(string $longUrl): void public function urlsWithBotProtectionCanBeShortenedWithUrlValidationEnabled(string $longUrl): void
{ {
// Requests to Twitter are randomly failing from GitHub actions. Let's skip this test there.
// This is a deprecated and low-used feature anyway.
if (env('CI', false)) {
$this->markTestSkipped();
}
[$statusCode] = $this->createShortUrl(['longUrl' => $longUrl, 'validateUrl' => true]); [$statusCode] = $this->createShortUrl(['longUrl' => $longUrl, 'validateUrl' => true]);
self::assertEquals(self::STATUS_OK, $statusCode); self::assertEquals(self::STATUS_OK, $statusCode);
} }