-
-
Notifications
You must be signed in to change notification settings - Fork 274
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2283 from shlinkio/develop
Release 4.3.0
- Loading branch information
Showing
334 changed files
with
3,064 additions
and
1,814 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
use RKA\Middleware\IpAddress; | ||
use RKA\Middleware\Mezzio\IpAddressFactory; | ||
|
||
use const Shlinkio\Shlink\IP_ADDRESS_REQUEST_ATTRIBUTE; | ||
|
||
return [ | ||
|
||
// Configuration for RKA\Middleware\IpAddress | ||
'rka' => [ | ||
'ip_address' => [ | ||
'attribute_name' => IP_ADDRESS_REQUEST_ATTRIBUTE, | ||
'check_proxy_headers' => true, | ||
'trusted_proxies' => [], | ||
'headers_to_inspect' => [ | ||
'CF-Connecting-IP', | ||
'X-Forwarded-For', | ||
'X-Forwarded', | ||
'Forwarded', | ||
'True-Client-IP', | ||
'X-Real-IP', | ||
'X-Cluster-Client-Ip', | ||
'Client-Ip', | ||
], | ||
], | ||
], | ||
|
||
'dependencies' => [ | ||
'factories' => [ | ||
IpAddress::class => IpAddressFactory::class, | ||
], | ||
], | ||
|
||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
FROM php:8.3-fpm-alpine3.19 | ||
FROM php:8.3-fpm-alpine3.20 | ||
MAINTAINER Alejandro Celaya <[email protected]> | ||
|
||
ENV APCU_VERSION 5.1.23 | ||
ENV APCU_VERSION 5.1.24 | ||
ENV PDO_SQLSRV_VERSION 5.12.0 | ||
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' | ||
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 | ||
ENV MS_ODBC_DOWNLOAD '7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8' | ||
ENV MS_ODBC_SQL_VERSION 18_18.4.1.1 | ||
|
||
RUN apk update | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,9 @@ | ||
FROM php:8.3-alpine3.19 | ||
FROM php:8.3-alpine3.20 | ||
MAINTAINER Alejandro Celaya <[email protected]> | ||
|
||
ENV APCU_VERSION 5.1.23 | ||
ENV PDO_SQLSRV_VERSION 5.12.0 | ||
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' | ||
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 | ||
ENV MS_ODBC_DOWNLOAD '7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8' | ||
ENV MS_ODBC_SQL_VERSION 18_18.4.1.1 | ||
|
||
RUN apk update | ||
|
||
|
@@ -36,16 +35,6 @@ RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \ | |
apk del .phpize-deps | ||
RUN docker-php-ext-install bcmath | ||
|
||
# Install APCu extension | ||
ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz | ||
RUN mkdir -p /usr/src/php/ext/apcu \ | ||
&& tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \ | ||
&& docker-php-ext-configure apcu \ | ||
&& docker-php-ext-install apcu \ | ||
&& rm /tmp/apcu.tar.gz \ | ||
&& rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \ | ||
&& echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini | ||
|
||
# Install xdebug and sqlsrv driver | ||
RUN apk add --update linux-headers && \ | ||
wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.