From c19f9c209f1e1cf6ddf79f1cb3400e874bbad658 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Thu, 16 Aug 2018 12:27:06 +0200 Subject: [PATCH 01/21] travis improvements --- .travis.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5e7037..dc045c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,5 @@ language: php php: - 7.0 -cache: - directories: - - $HOME/.composer/cache - before_script: - # Restore composer.json - - git checkout composer.json - - export TYPO3_PATH_WEB=$PWD/.Build/Web - -script: - - > - .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml \ No newline at end of file + - composer install \ No newline at end of file From 327d2a9bf018eae622da9b2a1f80a1935acab72c Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:32:46 +0200 Subject: [PATCH 02/21] downgrade symfony/dotenv to meet php 7.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46f2574..e575302 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "typo3/cms": "~8.7", "codappix/search_core": "0.0.4", "algolia/algoliasearch-client-php": "^1.23", - "symfony/dotenv": "^4.1" + "symfony/dotenv": "3.4" }, "require-dev": { "phpunit/phpunit": "~6.2.0", From 86c6285a6f4c4644e1f72f1d953e825c530db3ba Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:44:38 +0200 Subject: [PATCH 03/21] travis improvements --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dc045c5..c478b6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,21 @@ language: php php: - 7.0 +before_install: + - composer self-update + - composer --version + before_script: - - composer install \ No newline at end of file + - composer require typo3/minimal=^8 + # Restore composer.json + - git checkout composer.json + - export TYPO3_PATH_WEB=$PWD/.Build/Web + +script: + - > + echo; + export typo3DatabaseName="typo3"; + export typo3DatabaseHost="localhost"; + export typo3DatabaseUsername="root"; + export typo3DatabasePassword=""; + .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml From 3893460b00613bd741e323077b703f93221a9789 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:50:08 +0200 Subject: [PATCH 04/21] travis improvements 1 --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index c478b6c..2cfdd77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,8 @@ before_install: - composer --version before_script: - - composer require typo3/minimal=^8 - # Restore composer.json - - git checkout composer.json - - export TYPO3_PATH_WEB=$PWD/.Build/Web + - composer require typo3/minimal=^8 + # Restore composer.json + - git checkout composer.json + - export TYPO3_PATH_WEB=$PWD/.Build/Web -script: - - > - echo; - export typo3DatabaseName="typo3"; - export typo3DatabaseHost="localhost"; - export typo3DatabaseUsername="root"; - export typo3DatabasePassword=""; - .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml From ec094cde66cf100d2ce7aedd9d698543996711c8 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:53:24 +0200 Subject: [PATCH 05/21] travis improvements 2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cfdd77..3f5c43f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - composer --version before_script: - - composer require typo3/minimal=^8 + # - composer require typo3/minimal=^8 # Restore composer.json - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web From 444aaa1dee51b434dca80a14109b4526ea80002d Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:55:38 +0200 Subject: [PATCH 06/21] travis improvements 3 --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3f5c43f..72da86c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,3 +13,11 @@ before_script: - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web +script: + - > + echo; + echo "Running functional tests"; + export typo3DatabaseName="typo3"; + export typo3DatabaseHost="localhost"; + export typo3DatabaseUsername="root"; + export typo3DatabasePassword=""; From 11d1d711fd824a83522eeb288e9ee2de7d26aa73 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:57:37 +0200 Subject: [PATCH 07/21] travis improvements 4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 72da86c..894a498 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; + .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml From 5d638c53827cc478f94e4d6c9e95f7c8068a5a85 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 13:59:58 +0200 Subject: [PATCH 08/21] travis improvements 4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 894a498..9c1e73c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - composer --version before_script: - # - composer require typo3/minimal=^8 + - composer require typo3/cms # Restore composer.json - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web From a26ab7ef0cc1706b33ea2678c465612c5df41d4d Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:04:41 +0200 Subject: [PATCH 09/21] travis improvements 5 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c1e73c..95c486f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,16 @@ language: php php: - 7.0 +cache: + directories: + - $HOME/.composer/cache + before_install: - composer self-update - composer --version before_script: + - phpenv config-rm xdebug.ini - composer require typo3/cms # Restore composer.json - git checkout composer.json From f691d153787d01d004e7047ac1e38f157e2b723b Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:15:07 +0200 Subject: [PATCH 10/21] travis improvements 6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95c486f..2032c69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: before_script: - phpenv config-rm xdebug.ini - - composer require typo3/cms + - composer require typo3/cms=^8 # Restore composer.json - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web From 7f5f30a376b31f735cdd8ccec2875a21caac8b18 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:22:59 +0200 Subject: [PATCH 11/21] travis improvements 7 --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2032c69..0b961e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,13 @@ cache: directories: - $HOME/.composer/cache -before_install: - - composer self-update - - composer --version - before_script: + - composer self-update -q + - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; + - if [ -z "$dependencies" ]; then composer install; fi; + - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest -n; fi; + - if [ "$dependencies" = "highest" ]; then composer update -n; fi; + - composer show -i - phpenv config-rm xdebug.ini - composer require typo3/cms=^8 # Restore composer.json From 96befdf3f1d3e2d5eb060d5cdc0334f9a30a9cfb Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:27:17 +0200 Subject: [PATCH 12/21] travis improvements 8 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b961e0..e34ecd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_script: # Restore composer.json - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web + - touch $PWD/Tests/Functional/.env script: - > @@ -28,4 +29,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; - .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml + .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages From e8339d6d89307e5034aace80597715203aca0dd3 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:32:09 +0200 Subject: [PATCH 13/21] travis improvements 9 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e34ecd0..15643fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_script: - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web - touch $PWD/Tests/Functional/.env + - wget https://keys.algolia.engineering/client/algolia-keys && chmod +x algolia-keys script: - > @@ -29,4 +30,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; - .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages + $(./algolia-keys export) && .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages From 1dea3f8824a83852e1f493115923cf3f473f73c5 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 14:58:34 +0200 Subject: [PATCH 14/21] travis improvements 9 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15643fa..3bbeb76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_script: - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web - touch $PWD/Tests/Functional/.env - - wget https://keys.algolia.engineering/client/algolia-keys && chmod +x algolia-keys + - wget https://alg.li/algolia-keys && chmod +x algolia-keys script: - > @@ -30,4 +30,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; - $(./algolia-keys export) && .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages + eval $(./algolia-keys export) && .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages From 26dd64e438ff8dd9f03cf8cec39375a5389225a8 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 15:31:30 +0200 Subject: [PATCH 15/21] improve travis xx --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bbeb76..5d3692f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ cache: directories: - $HOME/.composer/cache +env: + secure: "d7Wuxpa7KEqgwfLHqTPdfkYvtY2LBfvPcs0jYzqVQe6ZOHOHgvRcaZZKwSwihskMe5F9rea5ifUWxk7qGvL1d83UHecohJMIg7qoI3adv20j677Xr99fIqVkbma3KuIAwEr2bnFZcSyVflBK6wPMLtgvZf3hWxvvuO9V4x8L4GjOqmfuPoXKjFoB4+D0boAZihfxB5/QUEITJStlBMeg8abHfN4sPvXU4RvbAf04IatHYIQh3qGG8+VZh9EqMAnK1I/Sjf9UL6S0UqUagJL7lE842LBeIdqKWz76zyTunDHqIWwvkwqhYX6yGGnkkN0Ttlp4OKvmpj6pLwlI5qmXX/CR7MyBP/r8ud/bK5F3/+YMAY7BgzpDDGeWROt3LN/mC6lcvsLJl48/Dj+g1E+EOPOO8pfxtrvpzO+4awSX1Yt5lTJLx27fWfseX+ZS1FbMCZzj8XZjjRanKpV4FldqwY3QL/Emu+lD5mMn86jp7PWcMECtnYzK+/VdFHI9juBs8ghuW1uVIFltOdy9me4HaLfmO8VLcelvRtNXZx0ak6dBF86M7IiCkQ0VBX1iOtV8Gr0qG70wl/QMwiKGGcIhPA5dq7Q5bHAibmQu9kVxRvBpaH6hPWOFO/JSqlHv0DzEybr4afBUxZmkXKEoHR9+Eu+LmzFAUg3CruIxNSFkBvs=" + secure: "Rvi4xoUyKbAQHFNqt9wfOSIIKlZRFWEc3LH0TU19ZAPEQdCO6PmL8FzXVo6NbC9aPIncxV8SZFkUJAb0vqwg8AnyasCa8pXgjVk9I5BdE9XVrnHg0ndOItwJGQUrFl/NKKu4kgdbqctNR3FS7hGW4sy+1+LsuWG8GabKG6toA/O9gL49wtgqDPrF6ir2b8WVcMK6TsbGk1u+kJJJZ3Bw4MDjYNw9QrtfC4i7cbCGYDVpsNk0EbXjY8lzp0LLW7NJ1FwCK5oQ40HbcXpH+3rO0Uyslv5s5VI7NbWvuDX3CicrnfFrwYOF7Crcv/AJ9T5lT5Hf9j4NVGRv0XgzhBJ2RlyewrBVTX8XfPO9BsJ6UfejuXUkjVF+M8qnq3u77RSYcjDuGQtF9vPoMMMxA0qP2zI6pT8LMfGVgOLfzd2d2v6c/6oagiYPa1tyKolfANAAUbyjsNEpmtcwKFyK4aVjomJCZoWOYeX5VnFZ3wuEC3FNzLlabtEc9n5oWk19WaU0EVMVSADNsYGXxeY1JifaHdQudlsABVZkXQ9Gt55vxiCTV/XCUFGYv7QiLcwF/JJaYwOzSZYoopIWcFHun/wi9poJlFK9wprs/vDDsFsIuwqPNe7WWf+DnEqDQ8UEJi7GbLeLSUeYpNhSy9m+Egu1u6v1EjHnjTjqwEQNhEV3ZZs=" + before_script: - composer self-update -q - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; @@ -20,7 +24,6 @@ before_script: - git checkout composer.json - export TYPO3_PATH_WEB=$PWD/.Build/Web - touch $PWD/Tests/Functional/.env - - wget https://alg.li/algolia-keys && chmod +x algolia-keys script: - > @@ -30,4 +33,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; - eval $(./algolia-keys export) && .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages + .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages From 9a2f1d68e7ac0093223e64df35cd34858bc16be8 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 15:36:10 +0200 Subject: [PATCH 16/21] improve travis xx --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d3692f..d6f797f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ cache: - $HOME/.composer/cache env: - secure: "d7Wuxpa7KEqgwfLHqTPdfkYvtY2LBfvPcs0jYzqVQe6ZOHOHgvRcaZZKwSwihskMe5F9rea5ifUWxk7qGvL1d83UHecohJMIg7qoI3adv20j677Xr99fIqVkbma3KuIAwEr2bnFZcSyVflBK6wPMLtgvZf3hWxvvuO9V4x8L4GjOqmfuPoXKjFoB4+D0boAZihfxB5/QUEITJStlBMeg8abHfN4sPvXU4RvbAf04IatHYIQh3qGG8+VZh9EqMAnK1I/Sjf9UL6S0UqUagJL7lE842LBeIdqKWz76zyTunDHqIWwvkwqhYX6yGGnkkN0Ttlp4OKvmpj6pLwlI5qmXX/CR7MyBP/r8ud/bK5F3/+YMAY7BgzpDDGeWROt3LN/mC6lcvsLJl48/Dj+g1E+EOPOO8pfxtrvpzO+4awSX1Yt5lTJLx27fWfseX+ZS1FbMCZzj8XZjjRanKpV4FldqwY3QL/Emu+lD5mMn86jp7PWcMECtnYzK+/VdFHI9juBs8ghuW1uVIFltOdy9me4HaLfmO8VLcelvRtNXZx0ak6dBF86M7IiCkQ0VBX1iOtV8Gr0qG70wl/QMwiKGGcIhPA5dq7Q5bHAibmQu9kVxRvBpaH6hPWOFO/JSqlHv0DzEybr4afBUxZmkXKEoHR9+Eu+LmzFAUg3CruIxNSFkBvs=" - secure: "Rvi4xoUyKbAQHFNqt9wfOSIIKlZRFWEc3LH0TU19ZAPEQdCO6PmL8FzXVo6NbC9aPIncxV8SZFkUJAb0vqwg8AnyasCa8pXgjVk9I5BdE9XVrnHg0ndOItwJGQUrFl/NKKu4kgdbqctNR3FS7hGW4sy+1+LsuWG8GabKG6toA/O9gL49wtgqDPrF6ir2b8WVcMK6TsbGk1u+kJJJZ3Bw4MDjYNw9QrtfC4i7cbCGYDVpsNk0EbXjY8lzp0LLW7NJ1FwCK5oQ40HbcXpH+3rO0Uyslv5s5VI7NbWvuDX3CicrnfFrwYOF7Crcv/AJ9T5lT5Hf9j4NVGRv0XgzhBJ2RlyewrBVTX8XfPO9BsJ6UfejuXUkjVF+M8qnq3u77RSYcjDuGQtF9vPoMMMxA0qP2zI6pT8LMfGVgOLfzd2d2v6c/6oagiYPa1tyKolfANAAUbyjsNEpmtcwKFyK4aVjomJCZoWOYeX5VnFZ3wuEC3FNzLlabtEc9n5oWk19WaU0EVMVSADNsYGXxeY1JifaHdQudlsABVZkXQ9Gt55vxiCTV/XCUFGYv7QiLcwF/JJaYwOzSZYoopIWcFHun/wi9poJlFK9wprs/vDDsFsIuwqPNe7WWf+DnEqDQ8UEJi7GbLeLSUeYpNhSy9m+Egu1u6v1EjHnjTjqwEQNhEV3ZZs=" + global: + - secure: "d7Wuxpa7KEqgwfLHqTPdfkYvtY2LBfvPcs0jYzqVQe6ZOHOHgvRcaZZKwSwihskMe5F9rea5ifUWxk7qGvL1d83UHecohJMIg7qoI3adv20j677Xr99fIqVkbma3KuIAwEr2bnFZcSyVflBK6wPMLtgvZf3hWxvvuO9V4x8L4GjOqmfuPoXKjFoB4+D0boAZihfxB5/QUEITJStlBMeg8abHfN4sPvXU4RvbAf04IatHYIQh3qGG8+VZh9EqMAnK1I/Sjf9UL6S0UqUagJL7lE842LBeIdqKWz76zyTunDHqIWwvkwqhYX6yGGnkkN0Ttlp4OKvmpj6pLwlI5qmXX/CR7MyBP/r8ud/bK5F3/+YMAY7BgzpDDGeWROt3LN/mC6lcvsLJl48/Dj+g1E+EOPOO8pfxtrvpzO+4awSX1Yt5lTJLx27fWfseX+ZS1FbMCZzj8XZjjRanKpV4FldqwY3QL/Emu+lD5mMn86jp7PWcMECtnYzK+/VdFHI9juBs8ghuW1uVIFltOdy9me4HaLfmO8VLcelvRtNXZx0ak6dBF86M7IiCkQ0VBX1iOtV8Gr0qG70wl/QMwiKGGcIhPA5dq7Q5bHAibmQu9kVxRvBpaH6hPWOFO/JSqlHv0DzEybr4afBUxZmkXKEoHR9+Eu+LmzFAUg3CruIxNSFkBvs=" + - secure: "Rvi4xoUyKbAQHFNqt9wfOSIIKlZRFWEc3LH0TU19ZAPEQdCO6PmL8FzXVo6NbC9aPIncxV8SZFkUJAb0vqwg8AnyasCa8pXgjVk9I5BdE9XVrnHg0ndOItwJGQUrFl/NKKu4kgdbqctNR3FS7hGW4sy+1+LsuWG8GabKG6toA/O9gL49wtgqDPrF6ir2b8WVcMK6TsbGk1u+kJJJZ3Bw4MDjYNw9QrtfC4i7cbCGYDVpsNk0EbXjY8lzp0LLW7NJ1FwCK5oQ40HbcXpH+3rO0Uyslv5s5VI7NbWvuDX3CicrnfFrwYOF7Crcv/AJ9T5lT5Hf9j4NVGRv0XgzhBJ2RlyewrBVTX8XfPO9BsJ6UfejuXUkjVF+M8qnq3u77RSYcjDuGQtF9vPoMMMxA0qP2zI6pT8LMfGVgOLfzd2d2v6c/6oagiYPa1tyKolfANAAUbyjsNEpmtcwKFyK4aVjomJCZoWOYeX5VnFZ3wuEC3FNzLlabtEc9n5oWk19WaU0EVMVSADNsYGXxeY1JifaHdQudlsABVZkXQ9Gt55vxiCTV/XCUFGYv7QiLcwF/JJaYwOzSZYoopIWcFHun/wi9poJlFK9wprs/vDDsFsIuwqPNe7WWf+DnEqDQ8UEJi7GbLeLSUeYpNhSy9m+Egu1u6v1EjHnjTjqwEQNhEV3ZZs=" before_script: - composer self-update -q From 421a979c725495fc0f207f2296edcc103efa56d5 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 15:38:20 +0200 Subject: [PATCH 17/21] improve travis xx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6f797f..4195a8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,4 +34,4 @@ script: export typo3DatabaseHost="localhost"; export typo3DatabaseUsername="root"; export typo3DatabasePassword=""; - .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml --group pages + .Build/bin/phpunit -v -c Tests/Functional/FunctionalTests.xml From 9036d9b02be41efce256509066ef3ac6d3d6cafa Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 16:14:35 +0200 Subject: [PATCH 18/21] improve tests for travis --- .../Connection/Algolia/AbstractFunctionalTestCase.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php index 0697e3e..8d96635 100644 --- a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php +++ b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php @@ -76,7 +76,8 @@ public function tearDown() protected function cleanUp() { - $this->client->deleteIndex($this->indexName); + $request = $this->client->deleteIndex($this->indexName); + $this->index->waitTask($request['taskID']); } /** @@ -90,8 +91,10 @@ public function initIndex($documentType) $this->indexName = $this->getIndexNameFromConfiguration($documentType); if ($this->indexName) { + $this->client->deleteIndex($this->indexName); //clean up first $this->index = $this->client->initIndex($this->indexName); } else { + $this->client->deleteIndex($documentType); //clean up first $this->index = $this->client->initIndex($documentType); } } From 694b6ac9ea34fb91063cf5c3c0bb15be0703a8a1 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 16:22:18 +0200 Subject: [PATCH 19/21] improve tests for travis --- .../Algolia/AbstractFunctionalTestCase.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php index 8d96635..fb0bedc 100644 --- a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php +++ b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php @@ -76,8 +76,7 @@ public function tearDown() protected function cleanUp() { - $request = $this->client->deleteIndex($this->indexName); - $this->index->waitTask($request['taskID']); + $this->deleteIndex($this->indexName); } /** @@ -91,14 +90,19 @@ public function initIndex($documentType) $this->indexName = $this->getIndexNameFromConfiguration($documentType); if ($this->indexName) { - $this->client->deleteIndex($this->indexName); //clean up first + $this->deleteIndex($this->indexName); //clean up first $this->index = $this->client->initIndex($this->indexName); } else { - $this->client->deleteIndex($documentType); //clean up first + $this->deleteIndex($documentType); //clean up first $this->index = $this->client->initIndex($documentType); } } + protected function deleteIndex($indexName) { + $request = $this->client->deleteIndex($indexName); + $this->index->waitTask($request['taskID']); + } + protected function getIndexNameFromConfiguration($documentType) { try { From 74dd56b82b680db273f7e76351da43352c1b3cbb Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 16:43:01 +0200 Subject: [PATCH 20/21] improve tests for travis --- .../Algolia/AbstractFunctionalTestCase.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php index fb0bedc..630940a 100644 --- a/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php +++ b/Tests/Functional/Connection/Algolia/AbstractFunctionalTestCase.php @@ -76,7 +76,8 @@ public function tearDown() protected function cleanUp() { - $this->deleteIndex($this->indexName); + $request = $this->client->deleteIndex($this->indexName); + $this->index->waitTask($request['taskID']); } /** @@ -90,19 +91,16 @@ public function initIndex($documentType) $this->indexName = $this->getIndexNameFromConfiguration($documentType); if ($this->indexName) { - $this->deleteIndex($this->indexName); //clean up first $this->index = $this->client->initIndex($this->indexName); + $request = $this->index->clearIndex(); + $this->index->waitTask($request['taskID']); } else { - $this->deleteIndex($documentType); //clean up first $this->index = $this->client->initIndex($documentType); + $request = $this->index->clearIndex(); + $this->index->waitTask($request['taskID']); } } - protected function deleteIndex($indexName) { - $request = $this->client->deleteIndex($indexName); - $this->index->waitTask($request['taskID']); - } - protected function getIndexNameFromConfiguration($documentType) { try { From 336891428c627b18e95aaab844fddd0d063f7ff3 Mon Sep 17 00:00:00 2001 From: Martin Hummer Date: Fri, 17 Aug 2018 17:11:31 +0200 Subject: [PATCH 21/21] finalize travis integration --- README.md | 16 +++++++++++----- .../Fixtures/AlgoliaCredentials.typoscript | 12 ------------ 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 Tests/Functional/Fixtures/AlgoliaCredentials.typoscript diff --git a/README.md b/README.md index 2f227d6..398e07b 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,30 @@ Algolia Search Indexer for TYPO3 8LTS ============================================ -This Extension is in a very early stage and is heavily dependent on [Codappix/search_core](https://github.com/Codappix/search_core) +This Extension depends on [Codappix/search_core](https://github.com/Codappix/search_core) -Translation Handling +Known Bugs - Translation Handling ---------------- Indexing of records works fine until it comes to pages_language_overlay. This should be obsolete with TYPO3 9 -Delete & Update does not work for this indexer and we suggest to use a cron job to reindex this table: +Delete & Update does not work for this indexer and i suggest to use a cron job to reindex this table: typo3cms index:delete pages_language_overlay typo3cms index:index pages_language_overlay -Testing your extension +Testing the extension ============================================ Test Setup ---------- The first thing you need to do is to go to your extension directory and *"tell"* composer to set up -the testing environment for a TYPO3 version you want to test against. For that, type `composer install` +the testing environment for a TYPO3 version you want to test against. For that, type `composer install` + +Environment Variables +---------- +Algolia credentials are taken from environment variables which are located at: +`/Tests/Functional/.env.example` +Update this file with your credentials and rename it to `/Tests/Functional/.env` Unit Tests diff --git a/Tests/Functional/Fixtures/AlgoliaCredentials.typoscript b/Tests/Functional/Fixtures/AlgoliaCredentials.typoscript deleted file mode 100644 index 9de1efb..0000000 --- a/Tests/Functional/Fixtures/AlgoliaCredentials.typoscript +++ /dev/null @@ -1,12 +0,0 @@ -plugin { - tx_searchcore { - settings { - connections { - algolia { - applicationID = 76JC6I1QL7 - apiKey = 49d36f868dda64113ee3bdb7ec64514a - } - } - } - } -} \ No newline at end of file