.github/workflows/continuous-integration.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout repository"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -49,7 +49,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout repository"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -78,10 +78,11 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: "Checkout repository"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install dependencies (apt)"
         run: |
@@ -108,7 +109,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout repository"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install dependencies (apt)"
         run: |
@@ -132,7 +133,7 @@ jobs:
         run: "./vendor/bin/phpunit --verbose --colors=always --coverage-text --coverage-clover build/logs/clover.xml"
 
       - name: "Publish coverage report to Codecov"
-        uses: "codecov/codecov-action@v3.1.1"
+        uses: "codecov/codecov-action@v3.1.4"
 
   unit-tests:
     name: "Unit Tests"
@@ -146,6 +147,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         operating-system:
           - "ubuntu-latest"
           - "windows-latest"
@@ -158,7 +160,7 @@ jobs:
           git config --system core.eol lf
 
       - name: "Checkout repository"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install dependencies (apt)"
         if: ${{ matrix.operating-system == 'ubuntu-latest' }}

.github/workflows/merge-dependabot-upgrades.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Auto-Merge
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
-        uses: ridedott/merge-me-action@v2.10.44
+        uses: ridedott/merge-me-action@v2.10.56
         with:
           # This must be used as GitHub Actions token does not support pushing
           # to protected branches.

.readthedocs.yml

@@ -1,11 +1,15 @@
 version: 2
 
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.7"
+
 sphinx:
   configuration: docs/conf.py
 
 formats: all
 
 python:
-  version: 3.7
   install:
     - requirements: docs/requirements.txt

CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## 4.7.5 - 2023-11-08
+
+### Fixed
+
+* Protect against UUIDv7 collisions within the same millisecond, as reported
+  in [#518](https://github.com/ramsey/uuid/issues/518) and fixed in
+  [#522](https://github.com/ramsey/uuid/pull/522).
+* Improve the return type hint for `UuidInterface::compareTo()`.
+
+
 ## 4.7.4 - 2023-04-15
 
 ### Fixed
@@ -464,7 +474,7 @@ The following functionality is deprecated and will be removed in ramsey/uuid
   for these fields. You may use the new `Math\CalculatorInterface::toIntegerValue()`
   method to convert the `Type\Hexadecimal` instances to instances of
   `Type\Integer`. This library provides `Math\BrickMathCalculator`, which may be
-  used for this purpose, or you may use the arbitrary-precision arithemetic
+  used for this purpose, or you may use the arbitrary-precision arithmetic
   library of your choice.
   * `getClockSeqHiAndReserved()`
   * `getClockSeqLow()`

src/Generator/UnixTimeGenerator.php

@@ -142,7 +142,7 @@ private function increment(): string
             self::$seedIndex = 21;
         }
 
-        self::$rand[5] = 0xffff & $carry = self::$rand[5] + (self::$seedParts[self::$seedIndex--] & 0xffffff);
+        self::$rand[5] = 0xffff & $carry = self::$rand[5] + 1 + (self::$seedParts[self::$seedIndex--] & 0xffffff);
         self::$rand[4] = 0xffff & $carry = self::$rand[4] + ($carry >> 16);
         self::$rand[3] = 0xffff & $carry = self::$rand[3] + ($carry >> 16);
         self::$rand[2] = 0xffff & $carry = self::$rand[2] + ($carry >> 16);

src/UuidInterface.php

@@ -46,7 +46,7 @@ interface UuidInterface extends
      *
      * @param UuidInterface $other The UUID to compare
      *
-     * @return int -1, 0, or 1 if the UUID is less than, equal to, or greater than $other
+     * @return int<-1,1> -1, 0, or 1 if the UUID is less than, equal to, or greater than $other
      */
     public function compareTo(UuidInterface $other): int;
 

tests/Provider/Dce/SystemDceSecurityProviderTest.php

@@ -449,7 +449,7 @@ public function provideWindowsGoodNetUserAndWmicGroupValues(): array
                 'expectedId' => '546',
             ],
             [
-                'netUserReponse' => 'Local Group Memberships   Some Group  Another Group',
+                'netUserResponse' => 'Local Group Memberships   Some Group  Another Group',
                 'wmicGroupResponse' => 'Some Group    S-1-5-80-19088743-1985229328-4294967295-1324',
                 'expectedGroup' => 'Some Group',
                 'expectedId' => '1324',