Skip to content

Commit

Permalink
Merge pull request #4 from Codeception/php8
Browse files Browse the repository at this point in the history
PHP 8 support
  • Loading branch information
Naktibalda authored Oct 24, 2020
2 parents cae4df5 + 6590386 commit 781be16
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 236 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]

steps:
- name: Checkout code
Expand All @@ -24,9 +24,7 @@ jobs:
run: composer validate

- name: Install dependencies
run: |
composer require phpunit/phpunit "<=8.5.2" --no-update --ignore-platform-reqs
composer install --prefer-dist --no-progress --no-interaction --no-suggest
run: composer install --prefer-dist --no-progress --no-interaction --no-suggest

- name: Run test suite
run: php vendor/bin/codecept run
21 changes: 0 additions & 21 deletions Robofile.php

This file was deleted.

5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@
],
"minimum-stability": "RC",
"require": {
"php": ">=5.6.0 <8.0",
"php": ">=5.6.0 <9.0",
"codeception/codeception": "^4.0",
"symfony/finder": ">=2.7 <6.0"
},
"require-dev": {
"codeception/util-robohelpers": "dev-master"
},
"conflict": {
"codeception/codeception": "<4.0"
},
Expand Down
199 changes: 0 additions & 199 deletions documentation.md

This file was deleted.

2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ composer require --dev "codeception/module-filesystem"

## Documentation

<a href="documentation.md">Look at documentation.md file</a>
<a href="https://codeception.com/docs/modules/Filesystem">Module documentation</a>
14 changes: 7 additions & 7 deletions src/Codeception/Module/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function openFile($filename)
public function deleteFile($filename)
{
if (!file_exists($this->absolutizePath($filename))) {
\PHPUnit\Framework\Assert::fail('file not found');
\Codeception\PHPUnit\TestCase::fail('file not found');
}
unlink($this->absolutizePath($filename));
}
Expand Down Expand Up @@ -204,7 +204,7 @@ public function seeThisFileMatches($regex)
public function seeFileContentsEqual($text)
{
$file = str_replace("\r", '', $this->file);
\PHPUnit\Framework\Assert::assertEquals($text, $file);
\Codeception\PHPUnit\TestCase::assertEquals($text, $file);
}

/**
Expand Down Expand Up @@ -249,7 +249,7 @@ public function seeFileFound($filename, $path = '')
{
if ($path === '' && file_exists($filename)) {
$this->openFile($filename);
\PHPUnit\Framework\Assert::assertFileExists($filename);
\Codeception\PHPUnit\TestCase::assertFileExists($filename);
return;
}

Expand All @@ -260,7 +260,7 @@ public function seeFileFound($filename, $path = '')
}

$this->openFile($found);
\PHPUnit\Framework\Assert::assertFileExists($found);
\Codeception\PHPUnit\TestCase::assertFileExists($found);
}

/**
Expand All @@ -272,19 +272,19 @@ public function seeFileFound($filename, $path = '')
public function dontSeeFileFound($filename, $path = '')
{
if ($path === '') {
\PHPUnit\Framework\Assert::assertFileNotExists($filename);
\Codeception\PHPUnit\TestCase::assertFileNotExists($filename);
return;
}

$found = $this->findFileInPath($filename, $path);

if ($found === false) {
//this line keeps a count of assertions correct
\PHPUnit\Framework\Assert::assertTrue(true);
\Codeception\PHPUnit\TestCase::assertTrue(true);
return;
}

\PHPUnit\Framework\Assert::assertFileNotExists($found);
\Codeception\PHPUnit\TestCase::assertFileNotExists($found);
}

/**
Expand Down

0 comments on commit 781be16

Please sign in to comment.