diff --git a/.travis.yml b/.travis.yml index 968ce6de222..dae7bdb0247 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,9 +80,14 @@ script: - if [ "$BEHAT_OPTS" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/behat $BEHAT_OPTS" ; fi - if [ "$REST_TEST_CONFIG" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "php -d date.timezone=$TEST_TIMEZONE -d memory_limit=-1 bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" ; fi -# disable mail notifications notifications: - email: false + slack: + rooms: + - secure: Xb/nKrA5C4E5pNZulEVht1fT4gsOgoQp9WDNWVSBXz8i8JVPUZo20MtKt67pXK2SmxXbgY8aWbHrD1Y3Lv5YLUCHPJQKVxFiDLTh7sACxvHoEa8EuLiQo9naitMSXL1S4PaC8ptaVn9fe2Fwfg+ydSFLCsFDa+qmdBYjNaf8W4M= + - secure: qEgnhpVaWJZQNvJRisv5Kb1vfuZ4H0LjPGWdTk9Q1+MmQMhv/zGV1Z/H1+FEmxlZxk7zrC5ooLs5+K5Nf24XycAM1yczYWGBWJa0P+WKO1KfPx/NbOdSugXIKfbW4JcmwY5mpxPHf+9nUbEOv6zu3cOhWJg41MbTLcGRle+NZVc= + on_success: change + on_failure: always + on_pull_requests: false # reduce depth (history) of git checkout git: diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Gateway/DoctrineDatabase.php index b541d14b145..eba6f411885 100644 --- a/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Gateway/DoctrineDatabase.php +++ b/eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Gateway/DoctrineDatabase.php @@ -893,7 +893,13 @@ public function loadPathData($id) if (empty($rows)) { // Normally this should never happen // @todo remove throw when tested - $path = implode('/', $pathData); + $pathDataArray = []; + + foreach ($pathData as $path) { + $pathDataArray[] = $path[0]['text']; + } + + $path = implode('/', $pathDataArray); throw new \RuntimeException("Path ({$path}...) is broken, last id is '{$id}': " . __METHOD__); } diff --git a/eZ/Publish/Core/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php index 071a509dc19..7d3c31f5f38 100644 --- a/eZ/Publish/Core/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php +++ b/eZ/Publish/Core/Persistence/Legacy/Notification/Gateway/DoctrineDatabase.php @@ -124,7 +124,7 @@ public function countUserPendingNotifications(int $userId): int ->select('COUNT(' . self::COLUMN_ID . ')') ->from(self::TABLE_NOTIFICATION) ->where($query->expr()->eq(self::COLUMN_OWNER_ID, ':user_id')) - ->where($query->expr()->eq(self::COLUMN_IS_PENDING, true)) + ->andWhere($query->expr()->eq(self::COLUMN_IS_PENDING, true)) ->setParameter(':user_id', $userId, PDO::PARAM_INT); return (int)$query->execute()->fetchColumn();