Composer : possibilité de passer à PHP 8

Bertrand Gauthierrequested to merge
bg-php8 into master

Salut David, voici une merge request pour autoriser PHP8 sur le master de unicaen/ldap ! Une objection ?

Merge request reports

src/UnicaenLdap/Service/AbstractService.php

+8 −2
Changes for src/UnicaenLdap/Service/AbstractService.php: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -161,8 +161,11 @@ abstract class AbstractService implements 
        if ($this->count > 0) {



            if ($orderBy !== null && is_string($orderBy)) {

                if (! function_exists($ldapSort = 'ldap_sort')) {

                    throw new \BadFunctionCallException("Impossible de trier, la fonction 'ldap_sort' n'existe plus depuis PHP 8.0");

                }

                ErrorHandler::start(E_WARNING);

                $isSorted = ldap_sort($resource, $search, $orderBy);

                $isSorted = $ldapSort($resource, $search, $orderBy);

                ErrorHandler::stop();

                if ($isSorted === false) {

                    throw new Exception($this, 'sorting: ' . $orderBy);
@@ -235,8 +238,11 @@ abstract class AbstractService implements 
        ErrorHandler::stop();

        if ($this->count > 0) {

            if ($orderBy !== null && is_string($orderBy)) {

                if (! function_exists($ldapSort = 'ldap_sort')) {

                    throw new \BadFunctionCallException("Impossible de trier, la fonction 'ldap_sort' n'existe plus depuis PHP 8.0");

                }

                ErrorHandler::start(E_WARNING);

                $isSorted = ldap_sort($resource, $search, $orderBy);

                $isSorted = $ldapSort($resource, $search, $orderBy);

                ErrorHandler::stop();

                if ($isSorted === false) {

                    throw new Exception($this, 'sorting: ' . $orderBy);

.gitlab-ci.yml

+0 −10
Changes for .gitlab-ci.yml: 0 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -2,22 +2,12 @@ image: registre.unicaen.fr:5000/unicaen-dev-php7.3-apache 


stages:

- publish

  - tests



cache:

  key: ${CI_COMMIT_REF_SLUG}

  paths:

  - vendor/



#unit-tests:

#  stage: tests

#  script:

#    - composer install --no-interaction --no-suggest --no-progress

#    - php vendor/bin/phpunit --coverage-text=coverage.txt --colors=never

#  artifacts:

#    paths:

#      - coverage.txt



update-satis:

  stage: publish

  script:

composer.json

+13 −13
Changes for composer.json: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -2,21 +2,21 @@ 
    "name": "unicaen/ldap",

    "description": "Module Ldap des applications Unicaen",

    "require": {

        "php": ">=7.3",

        "ext-mcrypt": "*",

        "laminas/laminas-config": "^3.2",

        "laminas/laminas-i18n": "^2.9",

        "laminas/laminas-ldap": "^2.10",

        "laminas/laminas-log": "^2.10",

        "laminas/laminas-modulemanager": "^2.8",

        "laminas/laminas-serializer": "^2.9",

        "laminas/laminas-servicemanager": "^3.4",

        "laminas/laminas-stdlib": "^3.2",

        "laminas/laminas-dependency-plugin": "^2.1"

        "php": "^7.3 || ^8.0",

        "ext-ldap":  "*",

        "laminas/laminas-config": "^3.7",

        "laminas/laminas-i18n": "^2.17",

        "laminas/laminas-ldap": "^2.14",

        "laminas/laminas-log": "^2.15",

        "laminas/laminas-modulemanager": "^2.11",

        "laminas/laminas-serializer": "^2.13",

        "laminas/laminas-servicemanager": "^3.16",

        "laminas/laminas-stdlib": "^3.13",

        "laminas/laminas-dependency-plugin": "^2.2"

    },

    "require-dev": {

        "phpunit/phpunit": ">=3.7",

        "laminas/laminas-test": "^3.2"

        "phpunit/phpunit": "^8.0",

        "laminas/laminas-test": "^4.0"

    },

    "autoload": {

        "psr-0": {