From c858c20e8dd8a824f3030fe435e86b4764eb6edd Mon Sep 17 00:00:00 2001 From: Chad Sikorra Date: Sat, 25 Apr 2026 13:24:23 -0400 Subject: [PATCH] Lock FreeDSx dependencies to avoid conflicts with a 1.0 release. --- .github/workflows/build.yml | 21 +++++++++------------ CHANGELOG.md | 4 ++++ composer.json | 4 ++-- src/FreeDSx/Snmp/Value/AbstractValue.php | 3 +++ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 481fa62..ae447ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: name: Static Analysis steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -16,13 +16,14 @@ jobs: - name: Get Composer Cache Directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + shell: bash + run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT" - name: Install Composer Dependencies run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader - name: Cache Dependencies - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -37,11 +38,11 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest, windows-latest] - php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.2'] name: Unit Tests for PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -63,18 +64,14 @@ jobs: - name: Get Composer Cache Directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + shell: bash + run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT" - name: Install Composer dependencies - if: ${{ matrix.php-versions != '8.1' }} run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader - - name: Install Composer dependencies (8.1) - if: ${{ matrix.php-versions == '8.1' }} - run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader --ignore-platform-reqs - - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c79968..88c5f0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +0.5.1 (2026-04-25) +------------------ +* Lock FreeDSx dependencies to avoid conflicts with a 1.0 release. + 0.5.0 (2022-01-29) ------------------ * Many static analysis fixes. The PhpStan level is now set to max. diff --git a/composer.json b/composer.json index a7b0739..0e3bdce 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ ], "require": { "php": ">=7.1", - "freedsx/asn1": ">=0.4.0", - "freedsx/socket": ">=0.3.0" + "freedsx/asn1": ">=0.4,<1.0", + "freedsx/socket": ">=0.3,<1.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2", diff --git a/src/FreeDSx/Snmp/Value/AbstractValue.php b/src/FreeDSx/Snmp/Value/AbstractValue.php index a163003..383429a 100644 --- a/src/FreeDSx/Snmp/Value/AbstractValue.php +++ b/src/FreeDSx/Snmp/Value/AbstractValue.php @@ -28,6 +28,9 @@ abstract class AbstractValue implements ProtocolElementInterface protected const ASN1_TAG = null; + /** + * @var class-string + */ protected const ASN1_CLASS = null; /**