diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 7c653d10d0637..9c102a70c9b80 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -22,9 +22,24 @@ jobs: services: oracle: - image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2" + image: ghcr.io/gvenzl/oracle-xe:11 + + # Provide passwords and other environment variables to container + env: + ORACLE_RANDOM_PASSWORD: true + APP_USER: autotest + APP_USER_PASSWORD: owncloud + + # Forward Oracle port ports: - - "1521:1521" + - 1521:1521/tcp + + # Provide healthcheck script options for startup + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 steps: - name: Checkout server @@ -41,7 +56,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,oci8,openssl,pcntl,pdo_sqlite,posix,sqlite,xml,zip tools: phpunit:8.5.2 coverage: none diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index 4ba1c6705f33d..804c237e9d8bb 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -66,7 +66,7 @@ public function __construct($prefix = '') { //\Memcached::OPT_BINARY_PROTOCOL => true, ]; // by default enable igbinary serializer if available - /** @psalm-suppress RedundantCondition */ + /** @psalm-suppress RedundantCondition,TypeDoesNotContainType */ if (\Memcached::HAVE_IGBINARY) { $defaultOptions[\Memcached::OPT_SERIALIZER] = \Memcached::SERIALIZER_IGBINARY;