Skip to content

Commit b94be23

Browse files
committed
Lock dependencies to prepare for a 1.0 release.
1 parent 9baa6da commit b94be23

5 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
2727

2828
- name: Cache Dependencies
29-
uses: actions/cache@v1
29+
uses: actions/cache@v4
3030
with:
3131
path: ${{ steps.composer-cache.outputs.dir }}
3232
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fail-fast: false
88
matrix:
99
operating-system: [ubuntu-latest, windows-latest]
10-
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
10+
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.2']
1111
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
1212
steps:
1313
- name: Checkout
@@ -38,15 +38,10 @@ jobs:
3838
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3939

4040
- name: Install Composer dependencies
41-
if: ${{ matrix.php-versions != '8.1' }}
4241
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
4342

44-
- name: Install Composer dependencies (8.1)
45-
if: ${{ matrix.php-versions == '8.1' }}
46-
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader --ignore-platform-reqs
47-
4843
- name: Cache dependencies
49-
uses: actions/cache@v1
44+
uses: actions/cache@v4
5045
with:
5146
path: ${{ steps.composer-cache.outputs.dir }}
5247
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
CHANGELOG
22
=========
33

4+
0.8.1 (2026-04-25)
5+
------------------
6+
* Lock FreeDSx dependencies to prepare for a 1.0 release. This will be the final 0.x release.
7+
48
0.8.0 (2022-05-21)
59
------------------
610
* Properly handle and reap child processes in the LDAP server.

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
],
1717
"require": {
1818
"php": ">=7.1",
19-
"freedsx/asn1": ">=0.4.0",
20-
"freedsx/socket": ">=0.5.0",
21-
"freedsx/sasl": ">=0.1.0",
22-
"psr/log": "^1|^2|^3"
19+
"freedsx/asn1": ">=0.4,<1.0",
20+
"freedsx/socket": ">=0.5,<1.0",
21+
"freedsx/sasl": ">=0.1,<1.0",
22+
"psr/log": "^1||^2||^3"
2323
},
2424
"require-dev": {
2525
"phpspec/phpspec": "^7.2|^7.1|^6.1|^5.1",

src/FreeDSx/Ldap/Operation/Response/SearchResultEntry.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ public static function fromAsn1(AbstractType $type)
8282
}
8383
}
8484

85-
$attributes[] = new Attribute($partialAttribute->getChild(0)->getValue(), ...$values);
85+
$attrType = $partialAttribute->getChild(0);
86+
if ($attrType === null) {
87+
throw new ProtocolException('The search result entry is malformed.');
88+
}
89+
90+
$attributes[] = new Attribute($attrType->getValue(), ...$values);
8691
}
8792
}
8893

0 commit comments

Comments
 (0)