diff --git a/.travis.yml b/.travis.yml index 29c095710f..d5b7079937 100644 --- a/.travis.yml +++ b/.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/; diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php index c2fd99396a..bfd883e650 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php +++ b/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'])) { diff --git a/lib/classes/module/report/sqlaction.php b/lib/classes/module/report/sqlaction.php index b39abea283..c642cea4eb 100644 --- a/lib/classes/module/report/sqlaction.php +++ b/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(); } diff --git a/lib/classes/module/report/sqldownload.php b/lib/classes/module/report/sqldownload.php index 51acccb793..485e5ac9e2 100644 --- a/lib/classes/module/report/sqldownload.php +++ b/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) { diff --git a/templates/web/report/generate_tab.html.twig b/templates/web/report/generate_tab.html.twig index ef79e2629d..4624f8e5f7 100644 --- a/templates/web/report/generate_tab.html.twig +++ b/templates/web/report/generate_tab.html.twig @@ -83,7 +83,7 @@ {% for class, config in result.display %} {% for key , res in value %} - {% if key == class %} + {% if key|lower == class %} {% if config.bound == 1 and "" not in res %} {% if key == "user" and value.user == "TOTAL" %} {{ res|raw }} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php index 4710357ad5..5d262cfa83 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php +++ b/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/', [ - 'template' => [], - 'accept' => [$param], - 'accept_hd' => [$param], - 'watermark' => [$param], - ]); + self::$DI['client']->request('POST', '/admin/users/demands/', array( + 'template' => array(), + 'accept' => array($param), + 'accept_hd' => array($param), + 'watermark' => array($param), + )); self::$DI['app']['phraseanet.appbox'] = $appbox; diff --git a/www/skins/report/report-table.css b/www/skins/report/report-table.css index f838c2d5a1..4c346dec92 100644 --- a/www/skins/report/report-table.css +++ b/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;