diff --git a/.travis.yml b/.travis.yml index 8ab91c905495..5607cd19edee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: - php: 7.2 - php: 5.5.38 - php: 5.6.25 - - php: hhvm + - php: hhvm-3.24 group: edge fast_finish: true diff --git a/Core/tests/Unit/Report/MetadataProviderUtilsTest.php b/Core/tests/Unit/Report/MetadataProviderUtilsTest.php index bf366f37a3f8..6fe692f42467 100644 --- a/Core/tests/Unit/Report/MetadataProviderUtilsTest.php +++ b/Core/tests/Unit/Report/MetadataProviderUtilsTest.php @@ -33,7 +33,7 @@ public function testAutoSelect() { $metadataProvider = MetadataProviderUtils::autoSelect($this->envs); $this->assertInstanceOf( - GaeFlexMetadataProvider::class, + GAEFlexMetadataProvider::class, $metadataProvider ); $metadataProvider = MetadataProviderUtils::autoSelect([]); diff --git a/Datastore/tests/Unit/KeyTest.php b/Datastore/tests/Unit/KeyTest.php index 285b84933817..edd228f5cc96 100644 --- a/Datastore/tests/Unit/KeyTest.php +++ b/Datastore/tests/Unit/KeyTest.php @@ -196,7 +196,7 @@ public function testStateNamed() ] ]); - $this->assertEquals($key->state(), key::STATE_NAMED); + $this->assertEquals($key->state(), Key::STATE_NAMED); } public function testStateIncomplete() @@ -207,7 +207,7 @@ public function testStateIncomplete() ] ]); - $this->assertEquals($key->state(), key::STATE_INCOMPLETE); + $this->assertEquals($key->state(), Key::STATE_INCOMPLETE); } public function testPath() diff --git a/ErrorReporting/tests/Unit/BootstrapTest.php b/ErrorReporting/tests/Unit/BootstrapTest.php index 0d3b6f0ea615..8b8398ab22a4 100644 --- a/ErrorReporting/tests/Unit/BootstrapTest.php +++ b/ErrorReporting/tests/Unit/BootstrapTest.php @@ -193,7 +193,7 @@ public function testErrorHandler( )->shouldBeCalledTimes(1); Bootstrap::$psrLogger = $this->psrBatchLogger->reveal(); MockValues::$errorReporting = $error['type']; // always match - BootStrap::errorHandler( + Bootstrap::errorHandler( $error['type'], $error['message'], $error['file'], @@ -205,7 +205,7 @@ public function testErrorHandlerWithMinorError() { Bootstrap::$psrLogger = null; MockValues::$errorReporting = 0; - $result = BootStrap::errorHandler( + $result = Bootstrap::errorHandler( E_ERROR, 'message', 'file', @@ -217,7 +217,7 @@ public function testErrorHandlerWithMinorError() public function testErrorHandlerWithoutLogger() { Bootstrap::$psrLogger = null; MockValues::$errorReporting = E_ERROR; - $result = BootStrap::errorHandler( + $result = Bootstrap::errorHandler( E_ERROR, 'message', 'file', @@ -253,7 +253,7 @@ public function testShutdownHandler( // The shutdownHandler should not do anything, so it should pass // with the empty psrBatchLogger mock. Bootstrap::$psrLogger = $this->psrBatchLogger->reveal(); - $this->assertNull(BootStrap::shutdownHandler()); + $this->assertNull(Bootstrap::shutdownHandler()); return; } $this->psrBatchLogger->getMetadataProvider() @@ -285,7 +285,7 @@ public function testShutdownHandler( $expectedContext )->shouldBeCalledTimes(1); Bootstrap::$psrLogger = $this->psrBatchLogger->reveal(); - BootStrap::shutdownHandler(); + Bootstrap::shutdownHandler(); } public function errorsAndMetadataProvider() diff --git a/Firestore/tests/Unit/ValueMapperTest.php b/Firestore/tests/Unit/ValueMapperTest.php index 5242074dff1d..c630c0d2b30f 100644 --- a/Firestore/tests/Unit/ValueMapperTest.php +++ b/Firestore/tests/Unit/ValueMapperTest.php @@ -194,7 +194,7 @@ public function decodedValues() $blobValue = 'hello world'; $blob = new Blob($blobValue); - $datetime = \DateTimeImmutable::createFromFormat('U.u', microtime(true)); + $datetime = \DateTimeImmutable::createFromFormat('U.u', (string) microtime(true)); $timestamp = new Timestamp($datetime); $now = (string) $datetime->format('U'); $nanos = (int) $datetime->format('u') * 1000; diff --git a/Logging/tests/Unit/PsrLoggerBatchTest.php b/Logging/tests/Unit/PsrLoggerBatchTest.php index f9ba10198836..04db5a0e12b8 100644 --- a/Logging/tests/Unit/PsrLoggerBatchTest.php +++ b/Logging/tests/Unit/PsrLoggerBatchTest.php @@ -120,7 +120,7 @@ public function testTraceIdLabelOnGAEFlex( [ 'batchEnabled' => true, 'batchRunner' => $this->runner->reveal(), - 'metadataProvider' => new GaeFlexMetadataProvider($server) + 'metadataProvider' => new GAEFlexMetadataProvider($server) ] ); $psrBatchLogger->info(