Skip to content

Commit

Permalink
patch
Browse files Browse the repository at this point in the history
  • Loading branch information
AnourValar committed Aug 8, 2023
1 parent e170099 commit ea5639c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 23 deletions.
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
"php": "^8.1"
},
"require-dev": {
"phpunit/phpunit": "^9.5.10",
"nunomaduro/larastan": "^1.0",
"laravel/pint": "^1.0",
"orchestra/testbench": "^7.6"
"phpunit/phpunit": "^10.0",
"orchestra/testbench": "^8.6"
},
"autoload": {
"psr-4": {"AnourValar\\Office\\": "src/"}
Expand Down
32 changes: 14 additions & 18 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="true"
stopOnFailure="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="vendor/autoload.php"
backupGlobals="false"
colors="true"
stopOnFailure="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
>
<coverage>
<include>
<directory suffix=".php">src/</directory>
</include>
</coverage>
<coverage/>
<testsuites>
<testsuite name="Office">
<directory>tests</directory>
</testsuite>
</testsuites>
<php></php>
<source>
<include>
<directory suffix=".php">src/</directory>
</include>
</source>
</phpunit>
3 changes: 2 additions & 1 deletion src/Sheets/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ function ($patterns) use ($data) {
* @return array
*/
protected function calculateDataSchema(
array &$values, array &$data,
array &$values,
array &$data,
array &$mergeCells,
SchemaMapper &$schema,
string $lastColumn
Expand Down

0 comments on commit ea5639c

Please sign in to comment.