Skip to content

Commit ef6dfab

Browse files
oscaroterooscarotero
authored
Merge pull request #3 from middlewares/php84-or-improvements
Add support for php8.4 and other improvements
2 parents 0b4fd91 + 59beb36 commit ef6dfab

File tree

12 files changed

+115
-44
lines changed

12 files changed

+115
-44
lines changed

‎.gitattributes

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
* text=auto eol=lf
22

3-
/tests export-ignore
4-
.editorconfig export-ignore
5-
.gitattributes export-ignore
6-
.gitignore export-ignore
7-
.travis.yml export-ignore
8-
phpunit.xml export-ignore
9-
phpcs.xml export-ignore
3+
/tests export-ignore
4+
.editorconfig export-ignore
5+
.gitattributes export-ignore
6+
.gitignore export-ignore
7+
.php-cs-fixer.php export-ignore
8+
phpcs.xml.dist export-ignore
9+
phpunit.xml.dist export-ignore
10+
.phpstan.neon export-ignore

‎.github/workflows/main.yaml

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: "testing"
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
88

99
jobs:
1010
qa:
@@ -13,19 +13,19 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Validate composer.json and composer.lock
1919
run: composer validate
2020

2121
- name: Cache Composer packages
2222
id: composer-cache
23-
uses: actions/cache@v2
23+
uses: actions/cache@v4
2424
with:
25-
path: vendor
26-
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
27-
restore-keys: |
28-
${{ runner.os }}-php-
25+
path: vendor
26+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-php-
2929
3030
- name: Install dependencies
3131
if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -40,37 +40,34 @@ jobs:
4040

4141
strategy:
4242
matrix:
43-
php:
44-
- 7.2
45-
- 7.3
46-
- 7.4
47-
composer-args: [ "" ]
48-
include:
49-
- php: 8.0
50-
composer-args: --ignore-platform-reqs
51-
fail-fast: false
43+
php:
44+
- 7.2
45+
- 7.3
46+
- 7.4
47+
- 8.0
48+
- 8.1
49+
- 8.2
50+
- 8.3
51+
- 8.4
5252

5353
steps:
5454
- name: Checkout
55-
uses: actions/checkout@v2
55+
uses: actions/checkout@v4
5656

5757
- name: Install PHP
5858
uses: shivammathur/setup-php@v2
5959
with:
6060
php-version: ${{ matrix.php }}
6161

6262
- name: Cache PHP dependencies
63-
uses: actions/cache@v2
63+
uses: actions/cache@v4
6464
with:
6565
path: vendor
6666
key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
6767
restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
6868

6969
- name: Install dependencies
70-
run: composer install --prefer-dist --no-progress ${{ matrix.composer-args }}
70+
run: composer install --prefer-dist --no-progress
7171

7272
- name: Tests
7373
run: composer test
74-
75-
- name: Tests coverage
76-
run: composer coverage

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ composer.lock
33
.php_cs.cache
44
coverage
55
.phpunit.result.cache
6+
.idea
7+
kit
8+
*.cache

‎.php-cs-fixer.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
return My\PhpCsFixerConfig::create()
4+
->setFinder(
5+
PhpCsFixer\Finder::create()
6+
->files()
7+
->name('*.php')
8+
->in(__DIR__.'/src')
9+
->in(__DIR__.'/tests')
10+
);

‎.phpstan.neon

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
parameters:
2+
level: 8
3+
paths:
4+
- src
5+
- tests

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [2.1.0] - 2025-03-21
9+
### Added
10+
- Support for PHP 8.4
11+
812
## [2.0.0] - 2020-12-03
913
### Added
1014
- Support for PHP 8
@@ -54,6 +58,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5458
## 0.1.0 - 2016-10-08
5559
First version
5660

61+
[2.1.0]: https://github.com/middlewares/aura-session/compare/v2.0.0...v2.1.0
5762
[2.0.0]: https://github.com/middlewares/aura-session/compare/v1.1.0...v2.0.0
5863
[1.1.0]: https://github.com/middlewares/aura-session/compare/v1.0.0...v1.1.0
5964
[1.0.0]: https://github.com/middlewares/aura-session/compare/v0.5.0...v1.0.0

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018
3+
Copyright (c) 2018-2025
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎composer.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@
1919
"require": {
2020
"php": "^7.2 || ^8.0",
2121
"aura/session": "^2.1",
22-
"psr/http-server-middleware": "^1.0"
22+
"psr/http-server-middleware": "^1"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^8|^9",
26-
"friendsofphp/php-cs-fixer": "^2.0",
27-
"squizlabs/php_codesniffer": "^3.0",
28-
"middlewares/utils": "^2.1",
29-
"phpstan/phpstan": "^0.12",
30-
"laminas/laminas-diactoros": "^2.3"
25+
"phpunit/phpunit": "^8 || ^9",
26+
"friendsofphp/php-cs-fixer": "^3",
27+
"squizlabs/php_codesniffer": "^3",
28+
"middlewares/utils": "^2 || ^3 || ^4",
29+
"phpstan/phpstan": "^1 || ^2",
30+
"laminas/laminas-diactoros": "^2 || ^3",
31+
"oscarotero/php-cs-fixer-config": "^2"
3132
},
3233
"autoload": {
3334
"psr-4": {
@@ -47,4 +48,4 @@
4748
"coverage": "phpunit --coverage-text",
4849
"coverage-html": "phpunit --coverage-html=coverage"
4950
}
50-
}
51+
}

‎phpcs.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="Middlewares coding standard">
3+
<description>Middlewares coding standard</description>
4+
5+
<!-- display progress -->
6+
<arg value="p"/>
7+
<arg name="report" value="full"/>
8+
<arg name="colors"/>
9+
10+
<!-- coding standard -->
11+
<rule ref="PSR2"/>
12+
13+
<!-- Paths to check -->
14+
<file>src</file>
15+
<file>tests</file>
16+
</ruleset>

‎phpunit.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit bootstrap="vendor/autoload.php"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
5+
backupGlobals="false"
6+
backupStaticAttributes="false"
7+
beStrictAboutOutputDuringTests="true"
8+
beStrictAboutTestsThatDoNotTestAnything="true"
9+
beStrictAboutTodoAnnotatedTests="true"
10+
colors="true"
11+
verbose="true"
12+
convertErrorsToExceptions="true"
13+
convertNoticesToExceptions="true"
14+
convertWarningsToExceptions="true"
15+
processIsolation="false"
16+
stopOnFailure="false"
17+
failOnWarning="true">
18+
<testsuites>
19+
<testsuite name="AuraSession test suite">
20+
<directory>tests</directory>
21+
</testsuite>
22+
</testsuites>
23+
24+
<filter>
25+
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
26+
<directory>./src</directory>
27+
<exclude>
28+
<directory>./tests</directory>
29+
<directory>./vendor</directory>
30+
</exclude>
31+
</whitelist>
32+
</filter>
33+
</phpunit>

‎src/AuraSession.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AuraSession implements MiddlewareInterface
3232
*
3333
* @param SessionFactory|null $factory
3434
*/
35-
public function __construct(SessionFactory $factory = null)
35+
public function __construct(?SessionFactory $factory = null)
3636
{
3737
$this->factory = $factory;
3838
}

‎tests/AuraSessionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AuraSessionTest extends TestCase
1313
/**
1414
* @runInSeparateProcess
1515
*/
16-
public function testAuraSession()
16+
public function testAuraSession(): void
1717
{
1818
$response = Dispatcher::run(
1919
[
@@ -31,7 +31,7 @@ function ($request) {
3131
$this->assertEquals('custom-session', (string) $response->getBody());
3232
}
3333

34-
public function testCustomAttribute()
34+
public function testCustomAttribute(): void
3535
{
3636
$response = Dispatcher::run(
3737
[

0 commit comments

Comments
 (0)