Skip to content

Commit

Permalink
Merge pull request #6 from code16/feature/laravel-8
Browse files Browse the repository at this point in the history
update for laravel8
  • Loading branch information
PierreBillaud authored Nov 4, 2020
2 parents bf61d56 + 4613b73 commit 413f897
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 33 deletions.
12 changes: 6 additions & 6 deletions composer.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
}
],
"require": {
"php": "^7.2",
"illuminate/support": "~5.8.0|^6.0|^7.0",
"illuminate/view": "~5.8.0|^6.0|^7.0",
"illuminate/cookie": "~5.8.0|^6.0|^7.0"
"php": ">=7.3",
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0",
"illuminate/view": "~5.8.0|^6.0|^7.0|^8.0",
"illuminate/cookie": "~5.8.0|^6.0|^7.0|^8.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "1.3.*",
"phpunit/phpunit": "~8.0|^8.5",
"orchestra/testbench": "4.*|5.*"
"phpunit/phpunit": "~8.0|^8.5|~9.0",
"orchestra/testbench": "4.*|5.*|6.*"
},
"autoload": {
"psr-4": {
Expand Down
45 changes: 18 additions & 27 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>

<testsuite name="Feature">
<directory suffix="Test.php">./tests/Feature</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<php>
<server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/>
</php>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>
<testsuite name="Feature">
<directory suffix="Test.php">./tests/Feature</directory>
</testsuite>
</testsuites>
<php>
<server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/>
</php>
</phpunit>
29 changes: 29 additions & 0 deletions phpunit.xml.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>

<testsuite name="Feature">
<directory suffix="Test.php">./tests/Feature</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<php>
<server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/>
</php>
</phpunit>

0 comments on commit 413f897

Please sign in to comment.