WIP Create friends ACL and get rid of ACCESS_FRIENDS

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
  - 7.0
  - 7.1
+ - 7.2
 
 # This helps builds go quicker on Travis since it enables caching of dependencies
 # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
@@ -22,7 +23,9 @@ branches:
 
 matrix:
   fast_finish: true
-
+  allow_failures:
+    - env: JOB_NAME=code_coverage
+
   include:
     # Build and test javascript
     - php: 7.0
@@ -46,10 +49,7 @@ matrix:
         - pip install --user "sphinx-intl"
         - export PATH=$PATH:$HOME/.local/bin
       script:
-        - sphinx-build -b html -nW docs docs/_build/html
-        - sphinx-build -b latex -nW docs docs/_build/latex
-        - sphinx-intl build --locale-dir=docs/locale/
-        - sphinx-build -b html -D language=es -n docs docs/_build/html
+        - composer docs:build
 
     # Memcached enabled
     - php: 7.0
@@ -87,6 +87,24 @@ matrix:
         - php -S localhost:8888 -c ./.scripts/travis/local_php_server.ini index.php &
         - sleep 3 # give Web server some time to bind to sockets, etc
 
+    # Code coverage build for Scrutinizer
+    - php: 7.0
+      env: JOB_NAME=code_coverage
+      before_install:
+        - composer config -g github-oauth.github.com ${GITHUB_TOKEN}
+      install:
+        - composer travis:install-with-mysql
+        - php -f ./.scripts/travis/enable_plugins.php
+        - php ./elgg-cli database:seed --limit=5 -vv
+        - php -S localhost:8888 -c ./.scripts/travis/local_php_server.ini index.php &
+        - sleep 3 # give Web server some time to bind to sockets, etc
+      script:
+        - ./vendor/bin/phpunit --coverage-clover=coverage.clover
+      after_script:
+        - php ./elgg-cli database:unseed -vv
+        - wget https://scrutinizer-ci.com/ocular.phar
+        - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+
     # HHVM not officially supported https://github.com/Elgg/Elgg/issues/11185
 
 services:

CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="2.3.5"></a>
+### 2.3.5  (2017-12-06)
+
+#### Contributors
+
+* Jerôme Bakker (7)
+
+#### Bug Fixes
+
+* **tests:**
+  * correct validation of action path ([232a87b8](https://github.com/Elgg/Elgg/commit/232a87b84f2e40a6e0f5bda3cb52b63fbb81877d))
+  * correct registration of view path ([950da0dc](https://github.com/Elgg/Elgg/commit/950da0dce83eb39e859da6dbc67c0b77c8445038))
+  * incorrect filename for test registration ([9af357be](https://github.com/Elgg/Elgg/commit/9af357be3ffe5e43045c0cf417585080d7f58fdb))
+  * moved incorrect registered test to correct location ([ba7c894d](https://github.com/Elgg/Elgg/commit/ba7c894d6ce0c86b7c8296d8a255da26fdf71766))
+
+
 <a name="2.3.4"></a>
 ### 2.3.4  (2017-09-21)
 

actions/admin/site/update_advanced.php

@@ -60,6 +60,12 @@
 $disable_rss = ('on' === get_input('disable_rss', false));
 elgg_save_config('disable_rss', $disable_rss);
 
+$friendly_time_number_of_days = get_input('friendly_time_number_of_days', 30);
+if ($friendly_time_number_of_days === '') {
+	$friendly_time_number_of_days = 30;
+}
+elgg_save_config('friendly_time_number_of_days', (int) $friendly_time_number_of_days);
+
 if (!$site->save()) {
 	return elgg_error_response(elgg_echo('admin:configuration:fail'));
 }

actions/comment/save.php

@@ -14,8 +14,6 @@
 	return elgg_error_response(elgg_echo('generic_comment:blank'));
 }
 
-$result = '';
-
 if ($comment_guid) {
 	// Edit an existing comment
 	$comment = get_entity($comment_guid);
@@ -32,16 +30,6 @@
 		return elgg_error_response(elgg_echo('generic_comment:failure'));
 	}
 
-
-	if (elgg_is_xhr()) {
-		// @todo move to its own view object/comment/content in 1.x
-		$result = elgg_view('output/longtext', [
-			'value' => $comment->description,
-			'class' => 'elgg-inner',
-			'data-role' => 'comment-text',
-		]);
-	}
-
 	$success_message = elgg_echo('generic_comment:updated');
 } else {
 	// Create a new comment on the target entity
@@ -86,4 +74,9 @@
 	}
 }
 
+$result = [
+	'guid' => $comment->guid,
+	'output' => elgg_view_entity($comment),
+];
+
 return elgg_ok_response($result, $success_message, $forward);

composer.json

@@ -12,6 +12,7 @@
         "ext-gd": "*",
         "ext-json": "*",
         "ext-xml": "*",
+        "ckeditor/ckeditor": "dev-full/4.7.x",
         "doctrine/dbal": "~2.5",
         "symfony/http-foundation": "~2.6",
         "mrclay/minify": "~2.0",
@@ -40,7 +41,9 @@
         "robmorgan/phinx": "^0.8.1",
         "symfony/console": "~3.3",
         "symfony/var-dumper": "~3.3",
-        "fzaninotto/faker": "^1.6"
+        "fzaninotto/faker": "^1.6",
+        "peppeocchi/php-cron-scheduler": "2.*",
+        "bower-asset/normalize-css": "dev-master"
     },
     "config": {
         "process-timeout": 0,
@@ -60,14 +63,20 @@
         "test": "phpunit",
         "travis:install": [
             "composer self-update",
-            "composer global require \"fxp/composer-asset-plugin:~1.1.4\" --prefer-dist",
+            "composer global require \"fxp/composer-asset-plugin:~1.4.2\" --prefer-dist",
             "composer install --prefer-dist"
         ],
         "travis:install-with-mysql": [
             "composer travis:install",
             "mysql -e 'create database elgg;'",
             "echo \"USE mysql; UPDATE user SET password=PASSWORD('password') WHERE user='root'; FLUSH PRIVILEGES;\" | mysql -u root",
             "php ./elgg-cli install --config ./install/cli/testing_app.php"
+        ],
+        "docs:build" : [
+            "sphinx-build -b html -nW docs docs/_build/html",
+            "sphinx-build -b latex -nW docs docs/_build/latex",
+            "sphinx-intl build --locale-dir=docs/locale/",
+            "sphinx-build -b html -D language=es -n docs docs/_build/html"
         ]
     },
     "suggest": {