Skip to content

Commit ff02dcc

Browse files
committed
PHP strict types required
1 parent f66459a commit ff02dcc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+86
-3
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'unary_operator_spaces' => false,
1515
'visibility_required' => false,
1616
'php_unit_test_class_requires_covers' => true,
17+
'declare_strict_types' => true,
1718
])
1819
->setFinder($finder)
1920
;

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"scripts": {
1212
"tests": "build/composer-update.sh && vendor/bin/phpunit",
1313
"tests-coverage": "build/composer-update.sh && php -d xdebug.mode=coverage vendor/bin/phpunit --coverage-clover clover.xml",
14-
"cs-check": "build/composer-update.sh && vendor/bin/php-cs-fixer fix --dry-run --verbose",
15-
"cs-fix": "build/composer-update.sh && vendor/bin/php-cs-fixer fix --verbose",
14+
"cs-check": "build/composer-update.sh && vendor/bin/php-cs-fixer fix --dry-run --verbose --allow-risky=yes",
15+
"cs-fix": "build/composer-update.sh && vendor/bin/php-cs-fixer fix --verbose --allow-risky=yes",
1616
"performance-tests": "php -n test/performance/testPerformance.php"
1717
},
1818
"config": {

examples/guzzleHttp.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
require_once __DIR__.'/../../vendor/autoload.php';
46

57
$client = new \GuzzleHttp\Client();

examples/memLeak.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
use JsonMachine\Items;
46

57
require_once __DIR__.'/../../vendor/autoload.php';

examples/symfonyHttpClient.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
use JsonMachine\Items;
46
use Symfony\Component\HttpClient\HttpClient;
57
use Symfony\Contracts\HttpClient\ResponseStreamInterface;

src/Exception/InvalidArgumentException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\Exception;
46

57
class InvalidArgumentException extends JsonMachineException

src/Exception/JsonMachineException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\Exception;
46

57
class JsonMachineException extends \Exception

src/Exception/PathNotFoundException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\Exception;
46

57
class PathNotFoundException extends JsonMachineException

src/Exception/SyntaxErrorException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\Exception;
46

57
class SyntaxErrorException extends JsonMachineException

src/Exception/UnexpectedEndSyntaxErrorException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\Exception;
46

57
class UnexpectedEndSyntaxErrorException extends SyntaxErrorException

src/FileChunks.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
class FileChunks implements \IteratorAggregate

src/Items.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
use JsonMachine\Exception\InvalidArgumentException;

src/JsonDecoder/DecodingError.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class DecodingError

src/JsonDecoder/ErrorWrappingDecoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class ErrorWrappingDecoder implements ItemDecoder

src/JsonDecoder/ExtJsonDecoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class ExtJsonDecoder implements ItemDecoder

src/JsonDecoder/InvalidResult.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class InvalidResult

src/JsonDecoder/ItemDecoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
interface ItemDecoder

src/JsonDecoder/PassThruDecoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class PassThruDecoder implements ItemDecoder

src/JsonDecoder/ValidResult.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine\JsonDecoder;
46

57
class ValidResult

src/Parser.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
use JsonMachine\Exception\InvalidArgumentException;

src/PositionAware.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
interface PositionAware

src/StreamChunks.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
use JsonMachine\Exception\InvalidArgumentException;

src/StringChunks.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
class StringChunks implements \IteratorAggregate

src/Tokens.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
use Generator;

src/TokensWithDebugging.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachine;
46

57
class TokensWithDebugging implements \IteratorAggregate, PositionAware

test/JsonMachineTest/Exception/SyntaxErrorExceptionTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\Exception;
46

57
use JsonMachine\Exception\SyntaxErrorException;

test/JsonMachineTest/FileChunksTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\FileChunks;

test/JsonMachineTest/ItemsOptionsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\Exception\InvalidArgumentException;

test/JsonMachineTest/ItemsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\Items;

test/JsonMachineTest/JsonDecoder/DecodingErrorTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\DecodingError;

test/JsonMachineTest/JsonDecoder/ErrorWrappingDecoderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\Items;

test/JsonMachineTest/JsonDecoder/ExtJsonDecoderTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\ExtJsonDecoder;
@@ -51,7 +53,7 @@ public function testPassesPassesDepthOptionToJsonDecode()
5153

5254
public function testPassesPassesBigIntOptionToJsonDecode()
5355
{
54-
$bigintDecoder = new ExtJsonDecoder(null, 1, JSON_BIGINT_AS_STRING);
56+
$bigintDecoder = new ExtJsonDecoder(false, 1, JSON_BIGINT_AS_STRING);
5557
$bigintResult = $bigintDecoder->decode('123123123123123123123');
5658
$this->assertSame('123123123123123123123', $bigintResult->getValue());
5759
}

test/JsonMachineTest/JsonDecoder/InvalidResultTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\InvalidResult;

test/JsonMachineTest/JsonDecoder/PassThruDecoderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\PassThruDecoder;

test/JsonMachineTest/JsonDecoder/StubDecoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\ItemDecoder;

test/JsonMachineTest/JsonDecoder/ValidResultTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest\JsonDecoder;
46

57
use JsonMachine\JsonDecoder\ValidResult;

test/JsonMachineTest/ParserTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\Exception\JsonMachineException;

test/JsonMachineTest/StreamChunksTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\Exception\InvalidArgumentException;

test/JsonMachineTest/StringChunksTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\StringChunks;

test/JsonMachineTest/TokensTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\FileChunks;

test/JsonMachineTest/ValidJsonPointersTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace JsonMachineTest;
46

57
use JsonMachine\Exception\InvalidArgumentException;

test/bootstrap.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
require_once __DIR__.'/../vendor/autoload.php';
46

57
if ( ! class_exists('PHPUnit_Framework_TestCase')) {

test/performance/testPerformance.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
use JsonMachine\Items;
46

57
require_once __DIR__.'/../../vendor/autoload.php';

0 commit comments

Comments
 (0)