Merge commit 'refs/changes/56/10256/6' of ssh://gerrit.tuleap.net:294…

…18/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap:
  request #10978: End PHP 5.3 support

Change-Id: Icdbfdd2d2ab567ee1977608e88de50b0c1615c83

Makefile

@@ -37,7 +37,7 @@ AUTOLOAD_EXCLUDES=^tests|^template
 .DEFAULT_GOAL := help
 
 help:
-	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z0-9_-\ ]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	@echo "(Other less used targets are available, open Makefile for details)"
 
 #
@@ -126,20 +126,14 @@ post-checkout: composer generate-mo dev-clear-cache dev-forgeupgrade ## Clear ca
 	npm install
 	npm run build
 	git clean -fd plugins/*/www/themes/FlamingParrot
-	@$(DOCKER) exec tuleap-web service httpd restart
+	@$(DOCKER) exec tuleap-web service rh-php56-php-fpm restart
 
 generate-po: ## Generate translatable strings
 	@tools/utils/generate-po.php `pwd`
 
 generate-mo: ## Compile tranlated strings into binary format
 	@tools/utils/generate-mo.sh `pwd`
 
-tests_php53:
-	$(DOCKER) run --rm=true -v $(CURDIR):/tuleap enalean/tuleap-test-ut-c6-php53
-
-tests_phpunit:
-	$(DOCKER) run -ti --rm=true -v $(CURDIR):/tuleap enalean/tuleap-test-phpunit-c6-php53
-
 tests_rest: ## Run all REST tests
 	$(DOCKER) run -ti --rm -v $(CURDIR):/usr/share/tuleap --mount type=tmpfs,destination=/tmp enalean/tuleap-test-rest:c6-php56-httpd24-mysql56
 
@@ -191,20 +185,10 @@ dev-forgeupgrade: ## Run forgeupgrade in Docker Compose environment
 dev-clear-cache: ## Clear caches in Docker Compose environment
 	@$(DOCKER) exec tuleap-web /usr/share/tuleap/src/utils/tuleap --clear-caches
 
-start: ## Start Tuleap Web + LDAP + DB in Docker Compose environment
-	@echo "Start Tuleap Web + LDAP + DB"
-	@./tools/docker/migrate_to_volume.sh
-	@$(DOCKER_COMPOSE) up -d web
-	@echo -n "Your instance will be soon available: http://"
-	@grep VIRTUAL_HOST .env | cut -d= -f2
-	@echo "You might want to type 'make show-passwords' to see site default passwords"
-	@echo -n "tuleap-web ip address: "
-	@$(DOCKER) inspect -f '{{.NetworkSettings.Networks.tuleap_default.IPAddress}}' tuleap-web
-
-start-php56: ## Start Tuleap web with php56 & nginx
+start-php56 start: ## Start Tuleap web with php56 & nginx
 	@echo "Start Tuleap in PHP 5.6"
 	@./tools/docker/migrate_to_volume.sh
-	@$(DOCKER_COMPOSE) -f docker-compose-php56.yml up -d web
+	@$(DOCKER_COMPOSE) -f docker-compose.yml up -d web
 	@echo -n "tuleap-web ip address: "
 	@$(DOCKER) inspect -f '{{.NetworkSettings.Networks.tuleap_default.IPAddress}}' tuleap-web
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: "2"
 services:
   web:
     container_name: tuleap-web
-    image: enalean/tuleap-aio-dev:nodb
+    image: enalean/tuleap-aio-dev:c6-php56-nginx
     volumes:
     - .:/usr/share/tuleap
     - ../tuleap-plugins:/usr/share/tuleap-plugins

src/common/autoload_libs.php

@@ -43,7 +43,4 @@ function get_markdown_path() {
 );
 $loader->register();
 
-// Load PHP compatibility libraries
-require_once('common/include/compat/hash_equals.php');
-
 require_once('vendor/autoload.php');

src/common/user/Password/StandardPasswordHandler.class.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) Enalean, 2015. All Rights Reserved.
+ * Copyright (c) Enalean, 2015-2018. All Rights Reserved.
  *
  * This file is a part of Tuleap.
  *
@@ -19,13 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Check if the package from EPEL repository is available
-if(file_exists('/usr/share/php/password_compat/password.php')) {
-    require_once('/usr/share/php/password_compat/password.php');
-} elseif(file_exists('/usr/share/php-password-compat/lib/password.php')) {
-    require_once('/usr/share/php-password-compat/lib/password.php');
-}
-
 class StandardPasswordHandler extends PasswordHandler {
     public function verifyHashPassword($plain_password, $hash_password) {
         return password_verify($plain_password, $hash_password);

src/composer.json

@@ -20,7 +20,7 @@
   },
   "config": {
     "platform": {
-      "php": "5.3.3",
+      "php": "5.6.25",
       "ext-bcmath": "0",
       "ext-mbstring": "0"
     }

src/etc/httpd.conf.rhel6.dist

@@ -1016,31 +1016,4 @@ Include conf/ssl.conf
 # Load plugins specific apache configuration
 Include conf.d/*.conf
 
-DocumentRoot "/usr/share/tuleap/src/www"
-
-<Directory "/usr/share/tuleap/src/www">
-    Options Includes FollowSymLinks MultiViews
-    AllowOverride All
-    AcceptPathInfo On
-    Order allow,deny
-    Allow from all
-    SetEnvIfNoCase Request_URI /file/download\.php no-gzip dont-vary
-</Directory>
-
-# Don't allow access to API for anyone.
-# Currently, the risk is low, so we only filter on UserAgent string (which can be easily forged)
-# For better security, you can filter on the server IP address
-SetEnvIf User-Agent ^Codendi let_me_in
-<Directory "/usr/share/tuleap/src/www/api/reference">
-    # API scrips do not end with ".php"
-    ForceType application/x-httpd-php
-    Order Deny,Allow
-    Deny from all
-    Allow from env=let_me_in
-</Directory>
-
-#
-# On the production server the local.inc file is in /etc/tuleap/conf/local.inc
-# because it contains sensitive data
-#
-SetEnv TULEAP_LOCAL_INC ""
+DocumentRoot "/usr/share/tuleap/src/www"

src/etc/nginx18/README.mkd

@@ -38,8 +38,6 @@ Then run
 
 The configuration is meant to be redeployable at anytime.
 
-Note: if you ever need to go back to apache mode, you can by editing `/etc/opt/rh/rh-nginx18/nginx/conf.d/tuleap.conf`
-and swaping the includes to "promote" `conf.d/tuleap-apache.proxy`
 
 Organisation
 ============

src/etc/nginx18/tuleap.conf.dist

@@ -21,10 +21,6 @@ server {
         client_max_body_size 256M;
 
         include conf.d/tuleap.d/*.conf;
-
-        # Available here in case of emergency, uncomment the
-        # line below (and comment the line above)
-        #include conf.d/tuleap-apache.proxy;
 }
 
 server {