Merge branch 'develop' of https://github.com/friendica/friendica into develop

Updating...
This commit is contained in:
Adam Clark 2020-08-21 11:22:26 -07:00
commit 820eed1ebf
17 changed files with 127 additions and 46 deletions

100
.github/workflows/php.yml vendored Normal file
View file

@ -0,0 +1,100 @@
name: Testing Friendica
on: [push, pull_request, pull_request_review]
jobs:
friendica:
name: Friendica (PHP ${{ matrix.php-versions }})
runs-on: ubuntu-latest
services:
mariadb:
image: mariadb:latest
env:
MYSQL_ALLOW_EMPTY_PASSWORD: true
MYSQL_DATABASE: test
MYSQL_PASSWORD: test
MYSQL_USER: test
ports:
- 3306/tcp
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
redis:
image: redis
ports:
- 6379/tcp
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
memcached:
image: memcached
ports:
- 11211/tcp
strategy:
fail-fast: false
matrix:
php-versions: ['7.2', '7.3', '7.4']
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: pecl
extensions: pdo_mysql, gd, zip, opcache, ctype, pcntl, ldap, apcu, memcached, redis, imagick, memcache
coverage: xdebug
ini-values: apc.enabled=1, apc.enable_cli=1
- name: Start mysql service
run: sudo /etc/init.d/mysql start
- name: Validate composer.json and composer.lock
run: composer validate
- name: Get composer cache directory
id: composercache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
- name: Install dependencies
run: composer install --prefer-dist
- name: Copy default Friendica config
run: cp config/local-sample.config.php config/local.config.php
- name: Verify MariaDB connection
env:
PORT: ${{ job.services.mariadb.ports[3306] }}
run: |
while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
sleep 1
done
- name: Setup MYSQL database
env:
PORT: ${{ job.services.mariadb.ports[3306] }}
run: |
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/ .
- name: Test with phpunit
run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
env:
MYSQL_HOST: 127.0.0.1
MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
MYSQL_DATABASE: test
MYSQL_PASSWORD: test
MYSQL_USER: test
REDIS_PORT: ${{ job.services.redis.ports[6379] }}
MEMCACHED_PORT: ${{ job.services.memcached.ports[11211] }}
MEMCACHE_PORT: ${{ job.services.memcached.ports[11211] }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
file: clover.xml

View file

@ -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)

View file

@ -1,4 +0,0 @@
extension="apcu.so"
apc.enabled = 1
apc.enable_cli = 1

View file

@ -1 +0,0 @@
extension="memcached.so"

View file

@ -1 +0,0 @@
extension="redis.so"

View file

@ -59,7 +59,7 @@ class Database
/** @var PDO|mysqli */ /** @var PDO|mysqli */
protected $connection; protected $connection;
protected $driver; protected $driver;
private $emulate_prepares = false; protected $emulate_prepares = false;
private $error = false; private $error = false;
private $errorno = 0; private $errorno = 0;
private $affected_rows = 0; private $affected_rows = 0;
@ -88,7 +88,7 @@ class Database
{ {
// Use environment variables for mysql if they are set beforehand // Use environment variables for mysql if they are set beforehand
if (!empty($server['MYSQL_HOST']) 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 && $server['MYSQL_PASSWORD'] !== false
&& !empty($server['MYSQL_DATABASE'])) && !empty($server['MYSQL_DATABASE']))
{ {

View file

@ -41,6 +41,7 @@ class Theme extends BaseModule
} }
// set the path for later use in the theme styles // set the path for later use in the theme styles
$THEMEPATH = "view/theme/$theme";
if (file_exists("view/theme/$theme/style.php")) { if (file_exists("view/theme/$theme/style.php")) {
require_once "view/theme/$theme/style.php"; require_once "view/theme/$theme/style.php";
} }

View file

@ -101,7 +101,7 @@ class StaticDatabase extends Database
{ {
// Use environment variables for mysql if they are set beforehand // Use environment variables for mysql if they are set beforehand
if (!empty($server['MYSQL_HOST']) 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 && $server['MYSQL_PASSWORD'] !== false
&& !empty($server['MYSQL_DATABASE'])) && !empty($server['MYSQL_DATABASE']))
{ {

View file

@ -70,6 +70,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 1, 'rel' => 1,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
// Having the same name and nick allows us to test // Having the same name and nick allows us to test
// the fallback to api_get_nick() in api_get_user() // the fallback to api_get_nick() in api_get_user()
@ -85,6 +86,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 0, 'rel' => 0,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
[ [
'id' => 44, 'id' => 44,
@ -98,6 +100,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => 2,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
[ [
'id' => 45, 'id' => 45,
@ -111,6 +114,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => 2,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
[ [
'id' => 46, 'id' => 46,
@ -124,6 +128,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 3, 'rel' => 3,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
[ [
'id' => 47, 'id' => 47,
@ -137,6 +142,7 @@ return [
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => 2,
'network' => 'dfrn', 'network' => 'dfrn',
'location' => 'DFRN',
], ],
], ],
'item-uri' => [ 'item-uri' => [

View file

@ -2869,6 +2869,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithScreenName() public function testApiDirectMessagesNewWithScreenName()
{ {
$this->app->user = ['nickname' => $this->selfUser['nick']];
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$result = api_direct_messages_new('json'); $result = api_direct_messages_new('json');
@ -2884,6 +2885,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithTitle() public function testApiDirectMessagesNewWithTitle()
{ {
$this->app->user = ['nickname' => $this->selfUser['nick']];
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$_REQUEST['title'] = 'message_title'; $_REQUEST['title'] = 'message_title';
@ -2901,6 +2903,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithRss() public function testApiDirectMessagesNewWithRss()
{ {
$this->app->user = ['nickname' => $this->selfUser['nick']];
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$result = api_direct_messages_new('rss'); $result = api_direct_messages_new('rss');

View file

@ -35,6 +35,7 @@ class MemcacheCacheTest extends MemoryCacheTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost'; $host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost';
$port = $_SERVER['MEMCACHE_PORT'] ?? '11211';
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
@ -43,7 +44,7 @@ class MemcacheCacheTest extends MemoryCacheTest
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'memcache_port') ->with('system', 'memcache_port')
->andReturn(11211); ->andReturn($port);
try { try {
$this->cache = new MemcacheCache($host, $configMock); $this->cache = new MemcacheCache($host, $configMock);

View file

@ -36,11 +36,12 @@ class MemcachedCacheTest extends MemoryCacheTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost'; $host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost';
$port = $_SERVER['MEMCACHED_PORT'] ?? '11211';
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'memcached_hosts') ->with('system', 'memcached_hosts')
->andReturn([0 => $host . ', 11211']); ->andReturn([0 => $host . ', ' . $port]);
$logger = new NullLogger(); $logger = new NullLogger();

View file

@ -35,6 +35,7 @@ class RedisCacheTest extends MemoryCacheTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['REDIS_HOST'] ?? 'localhost'; $host = $_SERVER['REDIS_HOST'] ?? 'localhost';
$port = $_SERVER['REDIS_PORT'] ?? null;
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
@ -43,7 +44,7 @@ class RedisCacheTest extends MemoryCacheTest
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'redis_port') ->with('system', 'redis_port')
->andReturn(null); ->andReturn($port);
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')

View file

@ -413,6 +413,8 @@ class InstallerTest extends MockedTest
*/ */
public function testImagickNotFound() public function testImagickNotFound()
{ {
$this->markTestIncomplete('Disabled due not working/difficult mocking global functions - needs more care!');
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
$this->setClasses(['Imagick' => true]); $this->setClasses(['Imagick' => true]);

View file

@ -36,6 +36,7 @@ class MemcacheCacheLockTest extends LockTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost'; $host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost';
$port = $_SERVER['MEMCACHE_PORT'] ?? '11211';
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
@ -44,7 +45,7 @@ class MemcacheCacheLockTest extends LockTest
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'memcache_port') ->with('system', 'memcache_port')
->andReturn(11211); ->andReturn($port);
$lock = null; $lock = null;

View file

@ -37,11 +37,12 @@ class MemcachedCacheLockTest extends LockTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost'; $host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost';
$port = $_SERVER['MEMCACHED_PORT'] ?? '11211';
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'memcached_hosts') ->with('system', 'memcached_hosts')
->andReturn([0 => $host . ', 11211']); ->andReturn([0 => $host . ', ' . $port]);
$logger = new NullLogger(); $logger = new NullLogger();

View file

@ -36,6 +36,7 @@ class RedisCacheLockTest extends LockTest
$configMock = \Mockery::mock(IConfig::class); $configMock = \Mockery::mock(IConfig::class);
$host = $_SERVER['REDIS_HOST'] ?? 'localhost'; $host = $_SERVER['REDIS_HOST'] ?? 'localhost';
$port = $_SERVER['REDIS_PORT'] ?? null;
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
@ -44,7 +45,7 @@ class RedisCacheLockTest extends LockTest
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')
->with('system', 'redis_port') ->with('system', 'redis_port')
->andReturn(null); ->andReturn($port);
$configMock $configMock
->shouldReceive('get') ->shouldReceive('get')