Fix Database $_SERVER usage and remove old .travis files

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 3da7ee8796febf65ecfdcf93e03a32b3800b1ba4..c905ee877159d6cfba792589fc0c34874674cb45 100644 (file)
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -5,20 +5,14 @@ jobs:
   friendica:
     name: Friendica (PHP ${{ matrix.php-versions }})
     runs-on: ubuntu-latest
-    env:
-      MYSQL_HOST: localhost
-      MYSQL_PORT: 3306
-      MYSQL_DATABASE: test
-      MYSQL_PASSWORD: ""
-      MYSQL_USERNAME: travis
     services:
       mariadb:
         image: mariadb:latest
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_DATABASE: test
-          MYSQL_PASSWORD: ""
-          MYSQL_USERNAME: travis
+          MYSQL_PASSWORD: test
+          MYSQL_USER: test
         ports:
           - 3306/tcp
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -83,8 +77,7 @@ jobs:
         env:
           PORT: ${{ job.services.mariadb.ports[3306] }}
         run: |
-          mysql -h"127.0.0.1" -P"$PORT" -uroot -e 'CREATE DATABASE IF NOT EXISTS test;'
-          mysql -h"127.0.0.1" -P"$PORT" -uroot test < database.sql
+          mysql -h"127.0.0.1" -P"$PORT" -utest -ptest test < database.sql
 
       - name: Test with Parallel-lint
         run: vendor/bin/parallel-lint --exclude vendor/ --exclude view/asset/ .
@@ -92,11 +85,11 @@ jobs:
       - name: Test with phpunit
         run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
         env:
-          MYSQL_HOST: localhost
-          MYSQL_PORT: 3306
+          MYSQL_HOST: 127.0.0.1
+          MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
           MYSQL_DATABASE: test
-          MYSQL_PASSWORD: ""
-          MYSQL_USERNAME: root
+          MYSQL_PASSWORD: test
+          MYSQL_USER: test
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index 5e4c348..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-language: php
-## Friendica officially supports PHP version >= 7.1
-php:
- - 7.1
- - 7.2
- - 7.3
-
-services:
- - mysql
- - redis
- - memcached
-env:
- - MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_USERNAME=travis MYSQL_PASSWORD="" MYSQL_DATABASE=test
-
-install:
- - composer install
-before_script:
- - cp config/local-sample.config.php config/local.config.php
- - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
- - mysql -utravis test < database.sql
- - pecl channel-update pecl.php.net
- - pecl config-set preferred_state beta
- - phpenv config-add .travis/redis.ini
- - phpenv config-add .travis/memcached.ini
-
-script:
- - vendor/bin/parallel-lint --exclude vendor/ --exclude view/asset/ .
- - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
-
-after_success: bash <(curl -s https://codecov.io/bash)

diff --git a/.travis/apcu.ini b/.travis/apcu.ini
deleted file mode 100644 (file)
index 9259866..0000000
--- a/.travis/apcu.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-extension="apcu.so"
-
-apc.enabled = 1
-apc.enable_cli = 1
\ No newline at end of file

diff --git a/.travis/memcached.ini b/.travis/memcached.ini
deleted file mode 100644 (file)
index c9a2ff0..0000000
--- a/.travis/memcached.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension="memcached.so"
\ No newline at end of file

diff --git a/.travis/redis.ini b/.travis/redis.ini
deleted file mode 100644 (file)
index ab995b8..0000000
--- a/.travis/redis.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension="redis.so"
\ No newline at end of file

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 0b38c24ba336b9ab27308dcdbfddeb2f0cca567e..4b96205a9adbb8c3bafde329a9b64e7ee76b43d5 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -59,7 +59,7 @@ class Database
        /** @var PDO|mysqli */
        protected $connection;
        protected $driver;
-       private $emulate_prepares = false;
+       protected $emulate_prepares = false;
        private $error          = false;
        private $errorno        = 0;
        private $affected_rows  = 0;
@@ -88,7 +88,7 @@ class Database
        {
                // Use environment variables for mysql if they are set beforehand
                if (!empty($server['MYSQL_HOST'])
-                   && (!empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER'])))
+                   && (!empty($server['MYSQL_USERNAME']) || !empty($server['MYSQL_USER']))
                    && $server['MYSQL_PASSWORD'] !== false
                    && !empty($server['MYSQL_DATABASE']))
                {

diff --git a/tests/Util/Database/StaticDatabase.php b/tests/Util/Database/StaticDatabase.php
index c95b690c635801bd04039ac9d19f93eb920cdb83..73a142d9a9c32931648f009a571c3f3c15674ed5 100644 (file)
--- a/tests/Util/Database/StaticDatabase.php
+++ b/tests/Util/Database/StaticDatabase.php
@@ -101,7 +101,7 @@ class StaticDatabase extends Database
        {
                // Use environment variables for mysql if they are set beforehand
                if (!empty($server['MYSQL_HOST'])
-                   && (!empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER'])))
+                   && (!empty($server['MYSQL_USERNAME']) || !empty($server['MYSQL_USER']))
                    && $server['MYSQL_PASSWORD'] !== false
                    && !empty($server['MYSQL_DATABASE']))
                {