Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Defining PHP 8.1 as base version #79

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Defining PHP 8.1 as base version #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb9caad
Starting type methods and parameters
byjg Jan 7, 2024
eb84af8
Starting type methods and parameters
byjg Jan 7, 2024
91c2686
PHP 8.1 as minimum version
byjg Jan 7, 2024
532ff30
Merge branch 'master' into 5.0
byjg Sep 13, 2024
af3235c
Add some build configuration and PSalm (buggy yet)
byjg Sep 13, 2024
a7e68c0
Fix Psalm issues.
byjg Sep 13, 2024
925b15f
Fix Code Smell
byjg Sep 13, 2024
25cbc26
Fix Test Namespaces
byjg Sep 13, 2024
30190f2
Upgrade breaking change from `byjg\webrequest` and `byjg\jwt-wrapper`
byjg Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ jobs:
strategy:
matrix:
php-version:
- "8.3"
- "8.2"
- "8.1"
- "8.0"
- "7.4"

steps:
- uses: actions/checkout@v4
Expand All @@ -29,6 +28,7 @@ jobs:
SPEC=swagger php -S 127.0.0.1:8080 tests/rest/app.php &
SPEC=openapi php -S 127.0.0.1:8081 tests/rest/app.php &
- run: ./vendor/bin/phpunit
- run: ./vendor/bin/psalm

Documentation:
if: github.ref == 'refs/heads/master'
Expand Down
4 changes: 2 additions & 2 deletions .idea/runConfigurations/Test_Project.xml → .idea/runConfigurations/Main.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/runConfigurations/Psalm.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions .travis.yml
View file
Open in desktop

This file was deleted.

13 changes: 7 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
"prefer-stable": true,
"license": "MIT",
"require": {
"byjg/webrequest": "4.9.*",
"php": ">=7.4",
"ext-json": "*"
"php": ">=8.1",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This constraint also allows version 8.4, but this version of PHP is not covered by the GitHub workflow.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am going to upgrade the project https://github.com/byjg/docker-php to support PHP 8.4 since alpine:edge has the 8.4 beta already :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is different: this packages can be installed with version 8.4 of PHP but it is not tested with that version. This can therefore lead to problems on the user side, as PHP does not follow semantic versioning.
This would help:

"php": "~8.1.0 || ~8.2.0 || ~8.3.0",

https://getcomposer.org/doc/articles/versions.md

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha. I'll add this.

"ext-json": "*",
"byjg/webrequest": "^5.0"
},
"require-dev": {
"phpunit/phpunit": "5.7.*|7.4.*|^9.5",
"byjg/restserver": "4.9.*"
"phpunit/phpunit": "^9.6",
"byjg/restserver": "^5.0",
"vimeo/psalm": "^5.9"
},
"autoload": {
"psr-4": {
Expand All @@ -20,7 +21,7 @@
},
"autoload-dev": {
"psr-4": {
"Test\\": "tests/"
"Tests\\": "tests/"
}
}
}
6 changes: 3 additions & 3 deletions docs/mock-requests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class MyTest extends ApiTestCase
{
public function testExpectOK()
{
$expectedResponse = \ByJG\Util\Psr7\Response::getInstance(200)
->withBody(new \ByJG\Util\Psr7\MemoryStream(json_encode([
$expectedResponse = \ByJG\WebRequest\Psr7\Response::getInstance(200)
->withBody(new \ByJG\WebRequest\Psr7\MemoryStream(json_encode([
"id" => 1,
"name" => "Spike",
"photoUrls" => []
Expand All @@ -39,7 +39,7 @@ e.g.
```php
<?php

$psr7Request = \ByJG\Util\Psr7\Request::getInstance(new Uri("/method_to_be_tested?param1=value1"))
$psr7Request = \ByJG\WebRequest\Psr7\Request::getInstance(new Uri("/method_to_be_tested?param1=value1"))
->withMethod("GET")
->withBody('{"foo":"bar"}');

Expand Down
18 changes: 18 additions & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<psalm
errorLevel="4"
resolveFromConfigFile="true"
findUnusedBaselineEntry="true"
findUnusedCode="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src" />
<directory name="tests" />
<ignoreFiles>
<directory name="vendor" />
</ignoreFiles>
</projectFiles>
</psalm>
Loading