Merge branch '3.8'

.travis.yml

@@ -24,7 +24,6 @@ before_script:
   - echo "extension=zmq.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
   - composer self-update
   - composer install --dev --prefer-source
-  - bin/developer system:uninstall
   - wget http://sphinxsearch.com/files/sphinx-2.0.6-release.tar.gz
   - tar xzf sphinx-2.0.6-release.tar.gz
   - sh -c "cd sphinx-2.0.6-release && wget http://snowball.tartarus.org/dist/libstemmer_c.tgz && tar xzf libstemmer_c.tgz && ./configure --with-libstemmer --with-iconv --with-mysql --enable-id64 --quiet && make -j --quiet && sudo make install"
@@ -50,6 +49,7 @@ php:
   - 5.5
 
 script:
+  - bin/developer system:uninstall
   - bin/developer dependencies:all --prefer-source
   - sh -c " if [ '$SETUP_MODE' = 'update' ]; then
               cp hudson/connexion.inc config/;

lib/Alchemy/Phrasea/Controller/Admin/Users.php

@@ -545,7 +545,7 @@ class Users implements ControllerProviderInterface
                     $row = $stmt->fetch(\PDO::FETCH_ASSOC);
                     $stmt->closeCursor();
 
-                    $acceptColl = $denyColl = [];
+                    $acceptColl = $denyColl = array();
 
                     if ($row) {
                         if (\Swift_Validate::email($row['usr_mail'])) {

lib/classes/module/report/sqlaction.php

@@ -68,7 +68,7 @@ class module_report_sqlaction extends module_report_sql implements module_report
 
             $stmt = $this->getConnBas()->prepare($this->sql);
             $stmt->execute($this->params);
-            $this->total = $stmt->rowCount();
+            $this->total_row = $stmt->rowCount();
             $stmt->closeCursor();
 
             $this->sql .= $this->filter->getOrderFilter($customFieldMap) ? : '';
@@ -91,7 +91,7 @@ class module_report_sqlaction extends module_report_sql implements module_report
 
             $stmt = $this->getConnBas()->prepare($this->sql);
             $stmt->execute($this->params);
-            $this->total = $stmt->rowCount();
+            $this->total_row = $stmt->rowCount();
             $stmt->closeCursor();
         }
 

lib/classes/module/report/sqldownload.php

@@ -97,7 +97,7 @@ class module_report_sqldownload extends module_report_sql implements module_repo
 
         $stmt = $this->connbas->prepare($this->sql);
         $stmt->execute($this->params);
-        $this->total = $stmt->rowCount();
+        $this->total_row = $stmt->rowCount();
         $stmt->closeCursor();
 
         if (count($customFieldMap) > 0) {

templates/web/report/generate_tab.html.twig

@@ -83,7 +83,7 @@
                 {% for class, config in result.display %}
                     <td class="{{ class }}">
                     {% for key , res in value %}
-                       {% if key == class %}
+                       {% if key|lower == class %}
                             {% if config.bound == 1 and "</i>" not in res %}
                                 {% if key == "user" and value.user == "<b>TOTAL</b>" %}
                                     {{ res|raw }}

tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php

@@ -424,12 +424,12 @@ class ControllerUsersTest extends \PhraseanetAuthenticatedWebTestCase
 
         $stmt->expects($this->any())
             ->method('fetchAll')
-            ->will($this->returnValue([
+            ->will($this->returnValue(array(
                 'usr_id' => $id,
                 'base_id' => $baseId,
                 'en_cours' => 1,
                 'refuser' => 0,
-            ]));
+            )));
 
         $pdo = $this->getMock('PDOMock');
 
@@ -438,7 +438,7 @@ class ControllerUsersTest extends \PhraseanetAuthenticatedWebTestCase
             ->will($this->returnValue($stmt));
 
         $appbox = $this->getMockBuilder('\appbox')
-            ->setMethods(['get_connection'])
+            ->setMethods(array('get_connection'))
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -448,12 +448,12 @@ class ControllerUsersTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailSuccessEmailUpdate');
 
-        self::$DI['client']->request('POST', '/admin/users/demands/', [
+        self::$DI['client']->request('POST', '/admin/users/demands/', array(
-            'template' => [],
+            'template' => array(),
-            'accept' => [$param],
+            'accept' => array($param),
-            'accept_hd' => [$param],
+            'accept_hd' => array($param),
-            'watermark' => [$param],
+            'watermark' => array($param),
-        ]);
+        ));
 
         self::$DI['app']['phraseanet.appbox'] = $appbox;
 

www/skins/report/report-table.css

@@ -42,7 +42,7 @@ form.report_form input[type=text]{
 
 .form_csv input[name=submit]{
 
-	background:url(../../report/images/csv.gif) top right no-repeat;
+	background:url(img/csv.gif) top right no-repeat;
 	width:15px;
 	height: 16px;
 	cursor: pointer;