php7

.gitignore

@@ -1,5 +1,5 @@
 engine/templates_c/*
-engine/include/vendor
+vendor
 config/config.local.php
 docker/www/config/config.local.php
 secured_data/ccls

composer.json

@@ -1,7 +1,5 @@
 {
     "config": {
-	"platform": {"php":"5.6"},
-        "vendor-dir": "engine/include/vendor"
     },
 
     "autoload": {
@@ -17,7 +15,7 @@
 		"classmap": [
             "engine/external/pear/",
 			"engine/include/",
-			"engine/config/",
+			"engine/Config/",
 			"engine/page/",
 			"engine/external/ChromePhp.php",
 			"phpunit/classes"
@@ -43,12 +41,11 @@
     },
   "require": {
     "ext-json": "*",
-    "ext-zip": "*",
-	  "ext-gd": "*"
+    "ext-zip": "*"
   },
     "require-dev": {
-        "phpunit/phpunit": "4.8.",
-        "phpunit/dbunit": "1.4.*",
+	"firephp/firephp-core": "^0.5.3",
+        "phpunit/phpunit": "^4.8",
         "mikey179/vfsstream": "^1.6"
     }
 }

database/README.md

@@ -0,0 +1,4 @@
+### Database Initialization
+Before you start first time database docker move inforex-v1.0.sql to init/ folder
+
+File removed form init/ folder to prevent accidental initialization.

database/init/inforex-v1.0.sql → database/inforex-v1.0.sql

@@ -1614,7 +1614,7 @@ DROP TABLE IF EXISTS `tasks`;
 CREATE TABLE `tasks` (
   `task_id` int(11) NOT NULL AUTO_INCREMENT,
   `datetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Data i czas utworzenia zadania.',
-  `datetime_start` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `datetime_start` timestamp NULL DEFAULT NULL,
   `type` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Identyfikator zadania.',
   `description` text COLLATE utf8mb4_unicode_ci,
   `parameters` text COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -1988,7 +1988,6 @@ UNLOCK TABLES;
 /*!50001 SET character_set_results     = utf8 */;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`gpw`@`localhost` SQL SECURITY DEFINER */
 /*!50001 VIEW `activities_view_users` AS select `u`.`screename` AS `screename`,count(0) AS `COUNT(*)`,max(`a`.`datetime`) AS `last_datetime`,`a`.`activity_page_id` AS `activity_page_id`,`a`.`datetime` AS `datetime`,`a`.`ip_id` AS `ip_id`,`a`.`user_id` AS `user_id`,`a`.`corpus_id` AS `corpus_id`,`a`.`report_id` AS `report_id`,`a`.`activity_type_id` AS `activity_type_id`,`a`.`execution_time` AS `execution_time` from (`activities` `a` join `users` `u` on((`a`.`user_id` = `u`.`user_id`))) group by `a`.`user_id` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -2006,7 +2005,6 @@ UNLOCK TABLES;
 /*!50001 SET character_set_results     = utf8 */;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
 /*!50001 VIEW `reports_annotations` AS select `ra`.`id` AS `id`,`ra`.`report_id` AS `report_id`,`ra`.`type_id` AS `type_id`,`at`.`name` AS `type`,`ra`.`from` AS `from`,`ra`.`to` AS `to`,`ra`.`text` AS `text`,`ra`.`user_id` AS `user_id`,`ra`.`creation_time` AS `creation_time`,`ra`.`stage` AS `stage`,`ra`.`source` AS `source` from (`reports_annotations_optimized` `ra` left join `annotation_types` `at` on((`at`.`annotation_type_id` = `ra`.`type_id`))) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -2024,7 +2022,6 @@ UNLOCK TABLES;
 /*!50001 SET character_set_results     = utf8 */;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
 /*!50001 VIEW `tokens_tags` AS select `tt`.`token_tag_id` AS `token_tag_id`,`tt`.`token_id` AS `token_id`,`b`.`text` AS `base`,`tt`.`base_id` AS `base_id`,`tokens_tags_ctags`.`ctag` AS `ctag`,`tt`.`disamb` AS `disamb` from ((`tokens_tags_optimized` `tt` left join `bases` `b` on((`b`.`id` = `tt`.`base_id`))) left join `tokens_tags_ctags` on((`tt`.`ctag_id` = `tokens_tags_ctags`.`id`))) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;