diff --git a/composer.json b/composer.json index d0e0b1544fa4dcafd16ed77a7feffa05e0bba0a2..f3c524be220ba894427b7782be5b925b03e45d03 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "minimum-stability": "stable", "prefer-stable": true, "require": { - "php": ">=7.4", + "php": ">=8.0", "ext-ctype": "*", "ext-curl": "*", "ext-iconv": "*", diff --git a/docker/legacy/Dockerfile b/docker/legacy/Dockerfile index e744cef4da96bdad1b39915b12580957ff38d66e..2962377a92a1ef66f1362cd70c2a256356433c4a 100644 --- a/docker/legacy/Dockerfile +++ b/docker/legacy/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-apache +FROM php:8.0-apache COPY front.conf /etc/apache2/sites-enabled/000-default.conf diff --git a/docker/symfony/Dockerfile b/docker/symfony/Dockerfile index 320dce9fc8f0e1bf02d2b8837753d068edc209b4..d25ae70cc88c39bfab0f49b5330051e7b1e1b2a3 100755 --- a/docker/symfony/Dockerfile +++ b/docker/symfony/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-apache +FROM php:8.0-apache USER root @@ -46,12 +46,9 @@ RUN docker-php-ext-install -j$(nproc) \ mysqli \ curl \ zip \ - pdo \ ctype \ iconv \ - json \ session \ - simplexml \ tokenizer # Install opcache extension for PHP accelerator @@ -82,7 +79,7 @@ RUN chmod u+x /bin/install_composer.sh RUN /bin/install_composer.sh # Install xdebug -RUN pecl install xdebug-2.9.0 \ +RUN pecl install xdebug \ && docker-php-ext-enable xdebug COPY xdebug.ini $PHP_INI_DIR/conf.d/ diff --git a/docker/symfony/xdebug.ini b/docker/symfony/xdebug.ini index 654ab2354e7bd09050a67296b11502fdc7d74c4f..833dd21107503f8d5cfe0ceb2a7f008e4aa95cf3 100755 --- a/docker/symfony/xdebug.ini +++ b/docker/symfony/xdebug.ini @@ -1,3 +1,3 @@ -xdebug.remote_port=9000 -xdebug.remote_enable=1 -xdebug.remote_connect_back=1 +xdebug.client_port=9000 +xdebug.mode=debug +xdebug.discover_client_host=true \ No newline at end of file diff --git a/src/Curl/CurlHandle.php b/src/Curl/CurlRequest.php similarity index 92% rename from src/Curl/CurlHandle.php rename to src/Curl/CurlRequest.php index 23f57e1052762ebcdf1fbd9655a85d49f3f30482..0185e0f58d92add24619c6a8640c3817504753dc 100755 --- a/src/Curl/CurlHandle.php +++ b/src/Curl/CurlRequest.php @@ -3,13 +3,11 @@ namespace App\Curl; use App\Exception\CurlInitFailedException; +use CurlHandle; -class CurlHandle +class CurlRequest { - /** - * @var resource - */ - private $curl_handler; + private CurlHandle $curl_handler; public function __construct() { diff --git a/src/Helper/LegacyHelper.php b/src/Helper/LegacyHelper.php index 5e96409e9c965ef970e7ed47e4dac747f03f5d78..59b56998f728ee93c1a1a4f52a08648235d98a5b 100755 --- a/src/Helper/LegacyHelper.php +++ b/src/Helper/LegacyHelper.php @@ -2,7 +2,7 @@ namespace App\Helper; -use App\Curl\CurlHandle; +use App\Curl\CurlRequest; use Exception; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\File\Exception\FileException; @@ -113,7 +113,7 @@ class LegacyHelper $url = "{$legacy_url}{$originalController}{$separator}?{$originalQueryString}"; - $curl_handler = new CurlHandle(); + $curl_handler = new CurlRequest(); try { $options_array = [ diff --git a/tests/functional/CapsuleControllerTest.php b/tests/functional/CapsuleControllerTest.php index 78b251ce726922d35b498ecda64443fcc5dab5e7..76de4550dc6a869cf40d0e2cf7d2bf692a1df831 100644 --- a/tests/functional/CapsuleControllerTest.php +++ b/tests/functional/CapsuleControllerTest.php @@ -118,7 +118,6 @@ class CapsuleControllerTest extends WebTestCase $client->request('GET', '/capsule/preview/' . substr($this->created_capsule->getLinkPath(), -6)); $this->assertResponseIsSuccessful('The preview should be allowed for none authenticated user'); $crawler = $client->getCrawler(); - str_contains('The project doesn\'t exist', $crawler->html()); } public function testNonLoggedUserShouldNotAccessToCapsuleEdition(): void