diff --git a/circle.yml b/circle.yml index 60ed962bcd..7c3212781a 100644 --- a/circle.yml +++ b/circle.yml @@ -33,12 +33,12 @@ database: override: - mysql -u ubuntu -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;'; post: - - "./bin/developer system:uninstall -vvv" - - "./bin/setup system:install -vvv --email=test@phraseanet.com --password=test --db-host=127.0.0.1 --db-user=ubuntu --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;" - - "./bin/developer ini:setup-tests-dbs -vvv" - - "./bin/console searchengine:index:create -vvv" - - "./bin/developer phraseanet:regenerate-sqlite -vvv" - - "./bin/developer phraseanet:generate-js-fixtures -vvv" + - "./bin/developer system:uninstall -v" + - "./bin/setup system:install -v --email=test@phraseanet.com --password=test --db-host=127.0.0.1 --db-user=ubuntu --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;" + - "./bin/developer ini:setup-tests-dbs -v" + - "./bin/console searchengine:index:create -v" + - "./bin/developer phraseanet:regenerate-sqlite -v" + - "./bin/developer phraseanet:generate-js-fixtures -v" test: override: diff --git a/lib/Alchemy/Phrasea/Collection/DbalCollectionRepository.php b/lib/Alchemy/Phrasea/Collection/DbalCollectionRepository.php index 729f47703c..203cf47bee 100644 --- a/lib/Alchemy/Phrasea/Collection/DbalCollectionRepository.php +++ b/lib/Alchemy/Phrasea/Collection/DbalCollectionRepository.php @@ -99,7 +99,7 @@ class DbalCollectionRepository implements CollectionRepository $row = $connection->fetchAssoc($query, [ ':collectionId' => $reference->getCollectionId() ]); if ($row !== false) { - return $this->collectionFactory->create($databoxId, $row['baseId'], $reference, $row); + return $this->collectionFactory->create($databoxId, $reference, $row); } return null;