Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query

lib/classes/patch/380alpha3a.php

@@ -50,6 +50,21 @@ class patch_380alpha3a extends patchAbstract
     {
         $conn = $databox->get_connection();
 
+        $sql = "CREATE TABLE IF NOT EXISTS `log_colls` (\n"
+            . " `id` int(11) unsigned NOT NULL AUTO_INCREMENT,\n"
+            . " `log_id` int(11) unsigned NOT NULL,\n"
+            . " `coll_id` int(11) unsigned NOT NULL,\n"
+            . " PRIMARY KEY (`id`),\n"
+            . " UNIQUE KEY `couple` (`log_id`,`coll_id`),\n"
+            . " KEY `log_id` (`log_id`),\n"
+            . " KEY `coll_id` (`coll_id`)\n"
+            . ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
+
+        $stmt = $conn->prepare($sql);
+        $stmt->execute();
+        $stmt->closeCursor();
+        unset($stmt);
+
         $removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
 
         $stmt = $conn->prepare($removeProc);

lib/classes/patch/410alpha13a.php

@@ -60,8 +60,14 @@ class patch_410alpha13a implements patchInterface
      */
     public function apply(base $databox, Application $app)
     {
+        // @see : https://phraseanet.atlassian.net/browse/PHRAS-2468
+        // to be able to migrate from 3.5 to 4.0.8, we must not delete the table anymore
+        // so the cli "bin/setup patch:log_coll_id" can be executed.
+
+        /*
         $sql = "DROP TABLE IF EXISTS `log_colls`";
         $databox->get_connection()->prepare($sql)->execute();
+        */
 
         /*
          * no need to do those ops, it's done by system:upgrade after fixing the xml scheme

resources/ansible/roles/php/tasks/mod-php.yml

@@ -28,3 +28,13 @@
   lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
+
+- name: set session.hash_bits_per_character apache2
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'
+
+- name: set session.hash_function apache2
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'

resources/ansible/roles/php/tasks/php-cli.yml

@@ -28,3 +28,13 @@
   lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
+
+- name: set session.hash_function cli
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'
+
+- name: set session.hash_bits_per_character cli
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'

resources/ansible/roles/php/tasks/php-fpm.yml

@@ -46,3 +46,16 @@
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
   notify: restart php{{ phpversion }}-fpm
+
+- name: set session.hash_function fpm
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
+              regexp=';?session.hash_function\s*=\s*'
+              line='session.hash_function = 1'
+  notify: restart php{{ phpversion }}-fpm
+
+
+- name: set session.hash_bits_per_character fpm
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
+              regexp=';?session.hash_bits_per_character\s*=\s*'
+              line='session.hash_bits_per_character = 6'
+  notify: restart php{{ phpversion }}-fpm