From b51124d435d427dd3f185284590c324b6b672e1a Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 17:31:21 +0200 Subject: [PATCH 01/10] Travis configuration --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..36246a1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: php +php: + - '7.0' + - '7.1' From 9d7db2972496ec2e96d64995a72ecbf427e39783 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 17:36:33 +0200 Subject: [PATCH 02/10] Travis configuration --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 36246a1..94315e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,4 @@ language: php php: - '7.0' - '7.1' +before_script: composer install \ No newline at end of file From 82ad48ab0db84253480058df70285e3d2b3f0f81 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 17:45:58 +0200 Subject: [PATCH 03/10] Travis configuration, Bugfix for tests --- .travis.yml | 1 - composer.json | 2 +- tests/BaseTest.php | 10 ++++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94315e3..a9533f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: php php: - - '7.0' - '7.1' before_script: composer install \ No newline at end of file diff --git a/composer.json b/composer.json index 7249122..88cb90a 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } }, "require": { - "php": ">=7.0.0", + "php": ">=7.1.0", "php-http/httplug": "^1.1", "php-http/message": "^1.6", "php-http/guzzle6-adapter": "^1.1", diff --git a/tests/BaseTest.php b/tests/BaseTest.php index 0efbdeb..a024e0b 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,8 +22,10 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); - $dotenv->load(); + if(file_exists(__DIR__ . '/../.env')) { + $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); + $dotenv->load(); + } } @@ -33,8 +35,8 @@ public function __construct($name = null, array $data = [], $dataName = '') protected function getClient() : Client { if(!$this->client) { $this->client = new Client( - getenv(BaseTest::ENV_USERNAME), - getenv(BaseTest::ENV_PASSWORD), + $_ENV[BaseTest::ENV_USERNAME], + $_ENV[BaseTest::ENV_PASSWORD], Client::VERSIO_URL_TEST, ($host = getenv(BaseTest::ENV_HOST)) ? $host : Client::VERSIO_HOST ); From 3423b1773bb58b037f2fd45543d7f6e93a2e2aed Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 18:13:01 +0200 Subject: [PATCH 04/10] Travis test --- tests/BaseTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index a024e0b..bf9f292 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,6 +22,8 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); + print_r($_ENV); + if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); $dotenv->load(); From 689ace1cf3f12a31e2ba7dce2df53eafedc55ba9 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:04:28 +0200 Subject: [PATCH 05/10] Travis test --- tests/BaseTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index bf9f292..130b137 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,7 +22,7 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - print_r($_ENV); + print_r(getenv('VERSIO_USERNAME')); if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); @@ -37,8 +37,8 @@ public function __construct($name = null, array $data = [], $dataName = '') protected function getClient() : Client { if(!$this->client) { $this->client = new Client( - $_ENV[BaseTest::ENV_USERNAME], - $_ENV[BaseTest::ENV_PASSWORD], + getenv(BaseTest::ENV_USERNAME), + getenv(BaseTest::ENV_PASSWORD), Client::VERSIO_URL_TEST, ($host = getenv(BaseTest::ENV_HOST)) ? $host : Client::VERSIO_HOST ); From 832eac4f4696be95f44410911a98d2449ef8461e Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:10:38 +0200 Subject: [PATCH 06/10] Travis test --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a9533f6..000fd36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: php php: - '7.1' +env: + - Test=test before_script: composer install \ No newline at end of file From 0d52b7493f8cd44ef07d6aa5c785857e1ff6cda9 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:17:48 +0200 Subject: [PATCH 07/10] Travis test --- tests/BaseTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index 130b137..d048953 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,7 +22,7 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - print_r(getenv('VERSIO_USERNAME')); + print $_SERVER['SERVER_ADDR']; if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); From c425072d5d0caddc3b5d0040e243198bc1aba1a3 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:19:49 +0200 Subject: [PATCH 08/10] Travis test --- tests/BaseTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index d048953..74028a3 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,7 +22,7 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - print $_SERVER['SERVER_ADDR']; + print_r($_SERVER); if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); From eb3c1c58e8670e484b6bd76c733364ef80d56bb0 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:31:00 +0200 Subject: [PATCH 09/10] Travis test --- tests/BaseTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index 74028a3..d69a101 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,7 +22,7 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - print_r($_SERVER); + file_get_contents('https://www.bekodesign.com/ip/'); if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); From 2a4fe48c3ca37509f3f29acc5d5174051d7c5fe4 Mon Sep 17 00:00:00 2001 From: Bert Kooij Date: Thu, 7 Sep 2017 19:33:43 +0200 Subject: [PATCH 10/10] Travis test --- tests/BaseTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/BaseTest.php b/tests/BaseTest.php index d69a101..548332d 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -22,8 +22,6 @@ public function __construct($name = null, array $data = [], $dataName = '') { parent::__construct($name, $data, $dataName); - file_get_contents('https://www.bekodesign.com/ip/'); - if(file_exists(__DIR__ . '/../.env')) { $dotenv = new \Dotenv\Dotenv(__DIR__ . '/../'); $dotenv->load();