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

Updates #25

Open
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open

Updates #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95ecbfd
Support psr/log 1|2|3
jakejohns Sep 17, 2023
3ec8163
Support phpunit 9 (php8)
jakejohns Sep 17, 2023
880aac7
Don't dynamically create property
jakejohns Sep 17, 2023
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"php": ">=7.1.0",
"atlas/info": "~1.0",
"atlas/mapper": "~1.0",
"psr/log": "~1.0"
"psr/log": "^1.0 || ^2.0 || ^3.0"
},
"autoload": {
"psr-4": {
"Atlas\\Cli\\": "src/"
}
},
"require-dev": {
"phpunit/phpunit": "~7.0",
"phpunit/phpunit": "~7.0 || ~9.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Version 7 of PHPUnit is dead, also version 7 of PHP.

"pds/skeleton": "~1.0"
},
"autoload-dev": {
Expand Down
23 changes: 12 additions & 11 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<phpunit bootstrap="phpunit.php">
<testsuites>
<testsuite name="atlas/cli">
<directory>tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="phpunit.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
Copy link
Contributor

Choose a reason for hiding this comment

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

This conflicts with the allowed versions in the Composer configuration, 7 and 9.

The local schema file can be used instead:

xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"

<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="atlas/cli">
<directory>tests/</directory>
</testsuite>
</testsuites>
</phpunit>
1 change: 1 addition & 0 deletions src/Skeleton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Skeleton
protected $templates = [];
protected $namespace;
protected $types = [];
protected $transform;

public function __construct(Config $config, Fsio $fsio, Logger $logger)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/FsioTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class FsioTest extends \PHPUnit\Framework\TestCase
protected $fsio;
protected $base;

protected function setUp()
protected function setUp() : void
{
$this->fsio = new Fsio();
$this->base = __DIR__ . DIRECTORY_SEPARATOR . 'tmp';
Expand Down
2 changes: 1 addition & 1 deletion tests/SkeletonTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class SkeletonTest extends \PHPUnit\Framework\TestCase
protected $stdout;
protected $factory;

protected function setUp()
protected function setUp() : void
{
$this->fsio = $this->newFsio();
$this->stdout = fopen('php://memory', 'w+');
Expand Down