feat(version upgrade)!: Bump to PHP8.5 #98
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| use PostHog\Consumer\ForkCurl; | ||
| use PostHog\Consumer\LibCurl; | ||
| use PostHog\Consumer\Socket; | ||
| use Symfony\Component\Clock\Clock; | ||
|
Member
There was a problem hiding this comment. total PHP noob is it necessary to go from standard library time to Symfony? is there something that could trip us up here?
Contributor
Author
There was a problem hiding this comment. It's a sneaky one, the https://github.com/slope-it/clock-mock#mocked-functionsmethods library modifies the standard library and replaced the We needed to switch this to the Symfony clock in order to be able to manipulate it during our testing (same with the case in |
||
|
|
||
| const SIZE_LIMIT = 50_000; | ||
|
|
||
|
|
@@ -829,7 +830,7 @@ private function formatTime($ts) | |
| { | ||
| // time() | ||
| if (null == $ts || !$ts) { | ||
| $ts = Clock::get()->now()->getTimestamp(); | ||
| } | ||
| if (false !== filter_var($ts, FILTER_VALIDATE_INT)) { | ||
| return date("c", (int)$ts); | ||
|
|
@@ -841,7 +842,7 @@ private function formatTime($ts) | |
| return date("c", strtotime($ts)); | ||
| } | ||
|
|
||
| return date("c", Clock::get()->now()->getTimestamp()); | ||
| } | ||
|
|
||
| // fix for floatval casting in send.php | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,9 +114,6 @@ public function sendRequest(string $path, ?string $payload, array $extraHeaders | |
| $httpResponse = $this->executePost($ch, $includeEtag); | ||
| $responseCode = $httpResponse->getResponseCode(); | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. No longer required as per: https://www.php.net/manual/en/migration85.deprecated.php#curl This is default behaviour since PHP 8.0: https://www.php.net/manual/en/class.curlhandle.php |
||
| // Handle 304 Not Modified - this is a success, not an error | ||
| if ($responseCode === 304) { | ||
| if ($this->debug) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,30 @@ | ||
| <?xml version="1.0"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" | ||
| backupGlobals="true" | ||
| backupStaticProperties="false" | ||
| colors="true" | ||
|
Contributor
Author
There was a problem hiding this comment. Explanation of the chnages: |
||
| processIsolation="false" | ||
| stopOnError="false" | ||
| stopOnFailure="false" | ||
| stopOnIncomplete="false" | ||
| stopOnSkipped="false" | ||
| stopOnRisky="false" | ||
| cacheDirectory=".phpunit.cache" | ||
| > | ||
| <coverage includeUncoveredFiles="true"> | ||
| <report> | ||
| <text outputFile="php://stdout" showUncoveredFiles="true"/> | ||
| </report> | ||
| </coverage> | ||
| <source> | ||
| <include> | ||
| <directory suffix=".php">./lib</directory> | ||
| </include> | ||
| </source> | ||
| <testsuites> | ||
| <testsuite name="posthog-php"> | ||
| <directory>test</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
| </phpunit> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?php | ||
|
|
||
| namespace PostHog\Test; | ||
|
|
||
| use Symfony\Component\Clock\Clock; | ||
| use Symfony\Component\Clock\MockClock; | ||
| use Symfony\Component\Clock\NativeClock; | ||
|
|
||
| /** | ||
| * Trait providing time mocking functionality for tests using Symfony Clock. | ||
| * This replaces the slope-it/clock-mock dependency which required the uopz extension. | ||
| */ | ||
|
Comment on lines
+9
to
+12
Member
There was a problem hiding this comment. ahhhhhh ok, so the switch to symfony is for this mocking? in which case, alongside the "is it correct/safe" question, is this (and i hate this word) idiomatic for PHP
Contributor
Author
There was a problem hiding this comment. Yeah traits are quite a common pattern within PHP, and they are frequently used to house "common / reusable methods" that span across a hierarchical / compositional object structure. + The added benefit here is that we cna have it act as a drop in replacement without changing much in the underlying function calls 😄 . Here is a blog post of how Laravel does it (from 2023), which is one of the most popular PHP frameworks: https://laraveldaily.com/post/traits-laravel-eloquent-examples (or rather how |
||
| trait ClockMockTrait | ||
| { | ||
| /** | ||
| * Execute a callback with a frozen date/time. | ||
| * This mimics the behavior of SlopeIt\ClockMock\ClockMock::executeAtFrozenDateTime() | ||
| * | ||
| * @param \DateTimeInterface $dateTime The date/time to freeze to | ||
| * @param callable $callback The callback to execute | ||
| * @return mixed The return value of the callback | ||
| */ | ||
| protected function executeAtFrozenDateTime(\DateTimeInterface $dateTime, callable $callback): mixed | ||
| { | ||
| $mockClock = new MockClock($dateTime instanceof \DateTimeImmutable | ||
| ? $dateTime | ||
| : \DateTimeImmutable::createFromInterface($dateTime)); | ||
|
|
||
| Clock::set($mockClock); | ||
|
|
||
| try { | ||
| return $callback(); | ||
| } finally { | ||
| // Reset to real clock | ||
| Clock::set(new NativeClock()); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so we need to bump to version 4 in here or it's automated?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should work out of the box once I follow the steps listed here: https://github.com/PostHog/posthog-php/blob/master/RELEASING.md!
There is nothing happening automatically, but I will obviously tag it with v4 😄 !